--- search/Search.cgi	2002/06/24 14:50:44	1.6
+++ search/Search.cgi	2002/06/24 17:53:11	1.10
@@ -1,19 +1,21 @@
 #!/usr/bin/perl -w
 
 #*****************************************************************************
-#       Copyright (C) 1993-2000, FS Consulting Inc. All rights reserved		 *
-#																			 *
-#																			 *
-#  This notice is intended as a precaution against inadvertent publication	 *
-#  and does not constitute an admission or acknowledgement that publication	 *
-#  has occurred or constitute a waiver of confidentiality.					 *
-#																			 *
-#  This software is the proprietary and confidential property				 *
-#  of FS Consulting, Inc.													 *
+#       Copyright (C) 1993-2000, FS Consulting Inc. All rights reserved      *
+#									     *
+#									     *
+#  This notice is intended as a precaution against inadvertent publication   *
+#  and does not constitute an admission or acknowledgement that publication  *
+#  has occurred or constitute a waiver of confidentiality.		     *
+#									     *
+#  This software is the proprietary and confidential property		     *
+#  of FS Consulting, Inc.						     *
 #*****************************************************************************
 
 #print "Content-type: text/plain\n\n";
 
+#use Data::Dumper;
+
 #--------------------------------------------------------------------------
 #
 # Author: Francois Schiettecatte (FS Consulting, Inc.)
@@ -2110,18 +2112,15 @@
 	my (@Words, $Word, @OffsetPairs, $OffsetPair, %Offsets, $Offset, $Start, $End, $OldStart, $OldEnd, $CurrentSummaryLength);
 	my ($DatabaseSummaryFilterKey, $DatabaseSummaryFilterFunction);
 	my ($Value, %Value, @Values, $ValueEntry);
-	
-	
+
+
 	# Check input parameters
 	if ( !defined($SearchResults) || !%Content ) {
 		return (0);
 	}
 	
-
-	
 	# Split the search results text into a search results list
 	@SearchResults = split(/\n/, $SearchResults);			
-		
 	
 	
 	# First we count up the number of results and scoop up
@@ -2431,7 +2430,7 @@
 	}
 
 
-	
+### FIX:: ADD SORT HERE	
 	if ( $ResultCount > 0 ) {
 
 		# Loop over each entry in the hits list
@@ -2689,6 +2688,9 @@
 			if ( $HTML ) {
 				print("<!-- resultItem -->\n");
 				#print("<TR><TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> $SelectorText </TD> <TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> <!-- relevance --> <B> $Score </B> <!-- /relevance --> </TD> <TD ALIGN=LEFT VALIGN=TOP> <A HREF=\"$LinkText\" OnMouseOver=\"self.status='Retrieve this document'; return true\"> $Headline <I> ( $main::DatabaseDescriptions{$Database} ) </I> </A> <BR> <FONT SIZE=-2>");
+				# decode some basic html from headline <b> <i>
+				$Headline =~ s/&lt;(\/?[bi])&gt;/<$1>/g;
+
 				print("<TR><TD ALIGN=LEFT VALIGN=TOP WIDTH=1%> $SelectorText </TD><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> <A HREF=\"$LinkText\" OnMouseOver=\"self.status='Retrieve this document'; return true\"> $Headline </A> <BR> <FONT SIZE=-2>&nbsp;");
 			} else {
 				printf("%3d $Headline ($main::DatabaseDescriptions{$Database})\n", $Score);
@@ -3102,7 +3104,13 @@
 	# Database selection
 	if ( %main::DatabaseDescriptions ) {
 
-		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=3> Odaberite bazu koju želite pretraživati: </TD></TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=4>
+		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> Odaberite bazu koju želite pretraživati:
+		</td><td>
+		<font size=-1>Označi
+			<a href=\"javascript:SetChecked(1)\">sve</a>,
+			<a href=\"javascript:SetChecked(0)\">niti jednu</a>.
+		</font>
+		</TD></TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=4>
 		");
 		
 		# Parse out the database names and put them into a
@@ -3117,56 +3125,8 @@
 				@ItemList = split(",", $SelectedDatabases);
 			}
 		}
-		foreach $ItemEntry ( @ItemList ) {
-			$Value{$ItemEntry} = $ItemEntry;
-		}
-		
 
-
-		$Flag = 0;
-
-		print('
-			<a href="javascript:SetChecked(1)">all</a>
-			<a href="javascript:SetChecked(0)">none</a>
-			');
-		
-		print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>\n");
-
-		my @html_database;
-
-		foreach my $key ( sort keys %main::DatabaseSort ) {
-			$DatabaseName = $main::DatabaseSort{$key};
-			$Value = ((defined($Value{$DatabaseName})) || (scalar(keys(%main::DatabaseDescriptions)) == 1) || !defined($main::RemoteUser) ) ? "CHECKED" : "";
-			$ItemEntry = &lEncodeURLData($DatabaseName);
-			if ($main::DatabaseDescriptions{$DatabaseName}) {
-				push @html_database,"<TD ALIGN=LEFT VALIGN=TOP><INPUT TYPE=\"checkbox\" NAME=\"Database\" VALUE=\"$DatabaseName\" $Value> <A HREF=\"$ENV{'SCRIPT_NAME'}/GetDatabaseInfo?Database=$ItemEntry\" OnMouseOver=\"self.status='Informacije io bazi $main::DatabaseDescriptions{$DatabaseName} '; return true\"> $main::DatabaseDescriptions{$DatabaseName}  </A> </TD>\n";
-			} else {
-				push @html_database,"<td align=left valign=top>$main::DatabaseDescriptions{$DatabaseName}</td>\n";
-			}
-		}
-
-
-		if ($main::ConfigurationData{'output-colums'}) {
-			# create database names in columns
-
-			my $cols = $main::ConfigurationData{'show-nr-colums'};
-			my $next = int($#html_database/$cols) ;
-
-			for(my $i=0; $i <= $next ; $i++) {
-				print("<tr>");
-				for(my $j=0; $j <= $cols; $j++) {
-					print($html_database[$i+$next*$j+$j] || '');
-				}
-				print("</tr>");
-			}
-
-		} else {
-			for(my $i=0; $i <= $#html_database ; $i=$i+1) {
-				print("<tr>",$html_database[$i],"</tr>");
-			}
-		}
-
-		print("</TABLE>\n");
+		&ShowDatabaseCheckBoxes(@ItemList);
 
 		print("</TD></TR>\n");
 		
@@ -3254,6 +3214,9 @@
 	print("<OPTION VALUE=\"SORT:DATE:DESC\" $Value> Datum - najprije novije\n");
 	$Value = (defined($main::FormData{'Order'}) && ($main::FormData{'Order'} eq "DATEASCSORT")) ? "SELECTED" : "";
 	print("<OPTION VALUE=\"SORT:DATE:ASC\" $Value> Datum - najprije starije\n");
+### FIX:: SORT
+#	print("<OPTION VALUE=\"SORT:700+:DESC\"> autor\n");
+#	print("<OPTION VALUE=\"SORT:200+:DESC\"> naslov\n");
 	print("</SELECT> </TD></TR>\n");
 
 
@@ -4148,40 +4111,16 @@
 
 		print("<TR><TD ALIGN=LEFT VALIGN=TOP COLSPAN=2> <B> Odabrane baze: </B> </TD></TR>\n");
 
-		print("<TR><TD ALIGN=LEFT VALIGN=TOP> Označite baze koje uvijek želite pretraživati: </TD> <TD ALIGN=LEFT VALIGN=TOP>\n");
+		print("<TR><TD ALIGN=LEFT VALIGN=TOP> Označite baze koje uvijek želite pretraživati:</TD> <TD ALIGN=LEFT VALIGN=TOP>\n");
 		
 		# Parse out the database names and put them into a
 		# hash table, they should be separated with a '\n'
-		undef(%Value);
 		if ( defined($SelectedDatabases) && ($SelectedDatabases ne "") ) {
 			@ItemList = split(",", $SelectedDatabases);
-			foreach $ItemEntry ( @ItemList ) {
-				$Value{$ItemEntry} = $ItemEntry;
-			}
-		}
-		
-		$Flag = 0;
-		print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH=100%\n");
-		
-		foreach $DatabaseName ( sort(keys(%main::DatabaseDescriptions)) ) {
-			
-			if ( $Flag == 0 ) {
-				print("<TR>");
-			}
-			
-			$Value = ((defined($Value{$DatabaseName})) || (scalar(keys(%main::DatabaseDescriptions)) == 1)) ? "CHECKED" : "";
-			$ItemEntry = &lEncodeURLData($DatabaseName);
-			print("<TD ALIGN=LEFT VALIGN=TOP><INPUT TYPE=\"checkbox\" NAME=\"SelectedDatabases\" VALUE=\"$DatabaseName\" $Value> <A HREF=\"$ENV{'SCRIPT_NAME'}/GetDatabaseInfo?Database=$ItemEntry\" OnMouseOver=\"self.status='Get Information about the $main::DatabaseDescriptions{$DatabaseName} database'; return true\">  $main::DatabaseDescriptions{$DatabaseName} </A></TD>\n");
-			
-			if ( $Flag == 1 ) {
-				print("</TR>");
-				$Flag = 0;
-			}
-			else {
-				$Flag = 1;
-			}
 		}
-		print("</TABLE>\n");
+	
+		&ShowDatabaseCheckBoxes(@ItemList);
+	
 		print("</TD></TR>\n");
 	}
 
@@ -7488,3 +7427,56 @@
 		}
 	}
 }
+
+#--------------------------------------------------------------------------
+# show list of all databases
+#
+# usage: ShowDatabaseCheckBoxes(@SelectedDatabases)
+
+sub ShowDatabaseCheckBoxes {
+	# Parse out the database names and put them into a
+	# hash table, they should be separated with a '\0'
+	my %Value;
+
+	foreach my $ItemEntry ( @_ ) {
+		$Value{$ItemEntry} = $ItemEntry;
+	}
+		
+	print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>\n");
+
+	my @html_database;
+
+	foreach my $key ( sort keys %main::DatabaseSort ) {
+		my $DatabaseName = $main::DatabaseSort{$key};
+		my $Value = ((defined($Value{$DatabaseName})) || (scalar(keys(%main::DatabaseDescriptions)) == 1) || !defined($main::RemoteUser) ) ? "CHECKED" : "";
+		my $ItemEntry = &lEncodeURLData($DatabaseName);
+		if ($main::DatabaseDescriptions{$DatabaseName}) {
+			push @html_database,"<TD ALIGN=LEFT VALIGN=TOP><INPUT TYPE=\"checkbox\" NAME=\"Database\" VALUE=\"$DatabaseName\" $Value> <A HREF=\"$ENV{'SCRIPT_NAME'}/GetDatabaseInfo?Database=$ItemEntry\" OnMouseOver=\"self.status='Informacije io bazi $main::DatabaseDescriptions{$DatabaseName} '; return true\"> $main::DatabaseDescriptions{$DatabaseName}  </A> </TD>\n";
+		} else {
+			push @html_database,"<td align=left valign=top>$main::DatabaseDescriptions{$DatabaseName}</td>\n";
+		}
+	}
+
+
+	if ($main::ConfigurationData{'output-colums'}) {
+		# create database names in columns
+
+		my $cols = $main::ConfigurationData{'show-nr-colums'};
+		my $next = int($#html_database/$cols) ;
+
+		for(my $i=0; $i <= $next ; $i++) {
+			print("<tr>");
+			for(my $j=0; $j <= $cols; $j++) {
+				print($html_database[$i+$next*$j+$j] || '');
+			}
+			print("</tr>");
+		}
+
+	} else {
+		for(my $i=0; $i <= $#html_database ; $i=$i+1) {
+			print("<tr>",$html_database[$i],"</tr>");
+		}
+	}
+
+	print("</TABLE>\n");
+}