--- search/Search.cgi	2002/06/24 13:47:06	1.5
+++ search/Search.cgi	2002/06/24 16:49:54	1.8
@@ -2689,6 +2689,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);
@@ -2971,7 +2974,23 @@
 
 	# Make sure that we send the header
 	$Value = ($ENV{'PATH_INFO'} eq "/GetExpandedSearch") ? "Pretraživanje s više kriterija" : "Jednostavno pretraživanje";
-	&vSendHTMLHeader($Value, undef);
+	my $JavaScript = '<SCRIPT LANGUAGE="JavaScript">
+		<!-- hide
+		function SetChecked(val) {
+			dml=document.Search;
+			len = dml.elements.length;
+			var i=0;
+			for( i=0 ; i<len ; i++) {
+				if (dml.elements[i].name==\'Database\') {
+					dml.elements[i].checked=val;
+				}
+			}
+		}
+		// -->
+		</SCRIPT>
+		';
+
+	&vSendHTMLHeader($Value, $JavaScript);
 
 	undef(%Value);
 	$Value{'GetSearch'} = "GetSearch";
@@ -3022,7 +3041,7 @@
 
 	# Send the start of the form and the buttons
 	print("<TD ALIGN=RIGHT VALIGN=TOP>\n");
-	print("<FORM ACTION=\"$ENV{'SCRIPT_NAME'}/GetSearchResults\" METHOD=POST> <INPUT TYPE=SUBMIT VALUE=\"Pretraži bazu\"> <INPUT TYPE=RESET VALUE=\"Pobriši polja\">\n");
+	print("<FORM ACTION=\"$ENV{'SCRIPT_NAME'}/GetSearchResults\" NAME=\"Search\" METHOD=POST> <INPUT TYPE=SUBMIT VALUE=\"Pretraži bazu\"> <INPUT TYPE=RESET VALUE=\"Pobriši polja\">\n");
 	print("</TD></TR>\n");
 
 	print("<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=3><BR></TD></TR>\n");
@@ -3086,7 +3105,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
@@ -3101,50 +3126,8 @@
 				@ItemList = split(",", $SelectedDatabases);
 			}
 		}
-		foreach $ItemEntry ( @ItemList ) {
-			$Value{$ItemEntry} = $ItemEntry;
-		}
-		
-
-
-		$Flag = 0;
-		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");
 		
@@ -4126,40 +4109,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");
 	}
 
@@ -7466,3 +7425,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");
+}