--- 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("