--- search/Search.cgi	2002/07/17 16:55:07	1.23
+++ search/Search.cgi	2002/10/24 18:25:20	1.26
@@ -1509,14 +1509,14 @@
 	# Initialize the search string
 	$SearchString = "";
 
-sub nuke_accents {
-	my $tmp = $_[0];
-	$tmp =~ tr/Çüéâäùæç³ëÕõî¬ÄÆÉÅåôö¥µ¦¶ÖÜ«»£èáíóú¡±®¾Êê¼ÈºÁÂ̪¯¿ÃãðÐÏËïÒÍÎìÞÙÓÔÑñò©¹ÀÚàÛýÝþ´­½²·¢¸¨ÿØø/CueaauccleOoiZACELlooLlSsOUTtLcaiouAaZzEezCsAAESZzAadDDEdNIIeTUOoNnnSsRUrUyYt'-".'',"'Rr/;
-	# convert search string to lower case -> make search case insensitive
-	$tmp =~ tr/A-Z/a-z/;
-	return $tmp;
-}
-
+	# tip gradje
+	if ( defined($main::FormData{'tip'}) ) {
+		my @t;
+		foreach my $tip ( split(/\0/, $main::FormData{'tip'}) ) {
+			push @t,"tip=$tip";
+		}
+		$SearchString .= "(".join(" or ",@t).") and ";
+	}
 
 	# Add the search terms
 	$SearchString .= defined($Content{'Any'}) ? ((($SearchString ne "") ? " AND " : "") . nuke_accents($Content{'Any'}) ) : "";
@@ -2998,7 +2998,7 @@
 
 	# Send the start of the form and the buttons
 	print("<TD ALIGN=RIGHT VALIGN=TOP>\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("<FORM ACTION=\"$ENV{'SCRIPT_NAME'}/GetSearchResults\" NAME=\"Search\" METHOD=POST> <INPUT TYPE=SUBMIT VALUE=\"Pretra¾i bazu\"> <INPUT TYPE=RESET VALUE=\"Vrati poèetne vrijednosti\">\n");
 	print("</TD></TR>\n");
 
 	print("<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=3><BR></TD></TR>\n");
@@ -3055,6 +3055,11 @@
 	print("<OPTION VALUE=\"OR\" $Value> Bilo koju rijeè (OR)\n");
 	print("</SELECT> </TD></TR>\n");
 
+	print "<tr><td align=left valign=top> Prika¾i samo tip graðe: </td><td align=left valign=top colspan=2>";
+	foreach my $tip (keys %default::tip) {
+		print '<input TYPE="checkbox" NAME="tip" VALUE="',nuke_accents($default::tip{$tip}),'" >',$default::tip{$tip},"&nbsp&nbsp;";
+	}
+	print "</td></tr>\n";
 
 	print("<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=3><HR WIDTH=50%></TD></TR>\n");
 	
@@ -3175,7 +3180,7 @@
 
 
 	print("<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=3><HR WIDTH=50%></TD></TR>\n");
-	print("<TR><TD ALIGN=RIGHT COLSPAN=3><INPUT TYPE=SUBMIT VALUE=\"Pretra¾i bazu\"> <INPUT TYPE=RESET VALUE=\"Pobri¹i polja\"></TD></TR>\n");
+	print("<TR><TD ALIGN=RIGHT COLSPAN=3><INPUT TYPE=SUBMIT VALUE=\"Pretra¾i bazu\"> <INPUT TYPE=RESET VALUE=\"Vrati poèetne vrijednosti\"></TD></TR>\n");
 
 	print("</FORM>\n");
 	print("</TABLE>\n");
@@ -3222,8 +3227,6 @@
 	my ($DatabaseRelevanceFeedbackFilterKey, $DatabaseRelevanceFeedbackFilterFunction);
 	my (@Values, %Value, $Value);
 
-
-	
 	# Check to see if there are any documents selected, if there are, they need
 	# to be converted to RF documents before we put up the header, this is because
 	# the header creates a search link from existing search fields, we also deduplicate
@@ -3278,16 +3281,18 @@
 		$main::FormData{'Database'} = join("\0", keys(%Databases));
 	}
 
-
+	# now add all databases that had to be included always
+	foreach (my $db = @main::always_selected_databases) {
+		$Databases{$db} = $Value{$db};
+	}
 
 	# Make sure that we send the header
 	&vSendHTMLHeader("Rezultati pretra¾ivanja", undef);
 	undef(%Value);
 	&vSendMenuBar(%Value);
 
-
 	# Check that at least one database was selected
-	if ( !defined($main::FormData{'Database'}) ) {
+	if ( !defined($main::FormData{'Database'}) && $#main::always_selected_databases < 0 ) {
 		print("<H3>Pretra¾ivanje baza:</H3>\n");
 		print("<H3><CENTER>Niste odabrali knji¾nicu koju ¾elite pretra¾ivati.</CENTER></H3>\n");
 		print("<P>\n");
@@ -3321,14 +3326,17 @@
 
 	# Convert all the '\0' to ','
 	$Databases =~ tr/\0/,/;
-	
+
+	# add always selected databases
+	if (@main::always_selected_databases) {
+		$Databases .= ",".join(",",@main::always_selected_databases);
+	}
 
 	# Add the max doc restriction
 	if ( !defined($main::FormData{'Max'}) ) {
 		$main::FormData{'Max'} = $main::DefaultMaxDoc;
 	}
 
-	
 	# Generate the search string
 	$SearchString = &sMakeSearchString(%main::FormData);
 
@@ -7397,7 +7405,7 @@
 	foreach my $ItemEntry ( @_ ) {
 		$Value{$ItemEntry} = $ItemEntry;
 	}
-		
+
 	print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>\n");
 	print "<tr><td colspan=3 align=\"center\">
 		<font size=-1>Oznaèi
@@ -7441,4 +7449,16 @@
 	}
 
 	print("</TABLE>\n");
+
+}
+
+#--------------------------------------------------------------------------
+#
+sub nuke_accents {
+	my $tmp = $_[0];
+	$tmp =~ tr/Çüéâäùæç³ëÕõî¬ÄÆÉÅåôö¥µ¦¶ÖÜ«»£èáíóú¡±®¾Êê¼ÈºÁÂ̪¯¿ÃãðÐÏËïÒÍÎìÞÙÓÔÑñò©¹ÀÚàÛýÝþ´½²·¢¸¨ÿØø/CueaauccleOoiZACELlooLlSsOUTtLcaiouAaZzEezCsAAESZzAadDDEdNIIeTUOoNnnSsRUrUyYt'".'',"'Rr/;
+	# convert search string to lower case -> make search case insensitive
+	$tmp =~ tr/A-Z/a-z/;
+	return $tmp;
 }
+