--- search/Search.cgi	2002/07/17 16:55:07	1.23
+++ search/Search.cgi	2002/07/17 18:37:39	1.24
@@ -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'}) ) : "";
@@ -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");
 	
@@ -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
@@ -3328,7 +3331,6 @@
 		$main::FormData{'Max'} = $main::DefaultMaxDoc;
 	}
 
-	
 	# Generate the search string
 	$SearchString = &sMakeSearchString(%main::FormData);
 
@@ -7442,3 +7444,14 @@
 
 	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;
+}
+