--- search/Search.cgi 2002/06/25 19:46:16 1.21 +++ search/Search.cgi 2002/09/06 23:48:41 1.25 @@ -393,7 +393,7 @@ } print ''; print ''; - print("\n\n"); + print("\n\n"); # Send the header snippet file @@ -1509,9 +1509,17 @@ # Initialize the search string $SearchString = ""; + # 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 " : "") . $Content{'Any'}) : ""; + $SearchString .= defined($Content{'Any'}) ? ((($SearchString ne "") ? " AND " : "") . nuke_accents($Content{'Any'}) ) : ""; # Add the generic field names @@ -1522,18 +1530,14 @@ if ( defined($Content{$FieldName}) && defined($Content{$FieldContent}) ) { - # nuke accented chars - $Content{$FieldContent} =~ tr/Çüéâäùæç³ëÕõî¬ÄÆÉÅåôö¥µ¦¶ÖÜ«»£èáíóú¡±®¾Êê¼ÈºÁÂ̪¯¿ÃãðÐÏËïÒÍÎìÞÙÓÔÑñò©¹ÀÚàÛýÝþ´­½²·¢¸¨ÿØø/CueaauccleOoiZACELlooLlSsOUTtLcaiouAaZzEezCsAAESZzAadDDEdNIIeTUOoNnnSsRUrUyYt'-".'',"'Rr/; - # convert search string to lower case -> make search case insensitive - $Content{$FieldContent} =~ tr/A-Z/a-z/; - + if ($Content{$FieldName} eq "ISBN") { # fix stupid problem with dashes in data $Content{$FieldContent} .= "*"; } $SearchString .= ($SearchString ne "") ? " AND " : ""; - $SearchString .= "$Content{$FieldName}=(" . $Content{$FieldContent} . ")"; + $SearchString .= "$Content{$FieldName}=(" . nuke_accents($Content{$FieldContent}) . ")"; } } @@ -2348,7 +2352,7 @@ if ( $HTML ) { - printf(" Pronaðeno: %s rezultata (Maksimalni broj pode¹en na: $Content{'Max'} ) \n", + printf(" Pronaðeno: %s rezultata (Maksimalni broj pode¹en na: $Content{'Max'} ) \n", ($ResultCount > 0) ? $ResultCount : "no"); print("\n"); @@ -2982,7 +2986,7 @@ if ( $ENV{'PATH_INFO'} eq "/GetExpandedSearch" ) { print("\n"); - print(" Jednostavo pretra¾ivanje (kliknite na trokutiæ)\n"); + print(" Jednostavno pretra¾ivanje (kliknite na trokutiæ)\n"); } else { print("\n"); @@ -2994,7 +2998,7 @@ # Send the start of the form and the buttons print("\n"); - print("
\n"); + print(" \n"); print("\n"); print("
\n"); @@ -3031,7 +3035,6 @@ } elsif ($i == ($field - 1)) { $Selected = "SELECTED"; } - print("
\n"); print("\n"); @@ -3219,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 @@ -3325,7 +3331,6 @@ $main::FormData{'Max'} = $main::DefaultMaxDoc; } - # Generate the search string $SearchString = &sMakeSearchString(%main::FormData); @@ -3736,7 +3741,7 @@ if ( $main::ConfigurationData{'allow-relevance-feedback-searches'} eq "yes" ) { print("