--- search/Search.cgi 2002/06/25 19:46:16 1.21 +++ search/Search.cgi 2002/07/02 17:18:43 1.22 @@ -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 = ""; +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; +} + # 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"); @@ -3127,7 +3131,7 @@ # Send the end date - print(" Ograniči na knjige izdane prije godine:: \n"); $Value = (!defined($main::FormData{'Before'})) ? "SELECTED" : ""; print("

Odabranima se smatraju svi rezultati ukoliko niste učinili nikakav dodatan odabir.	\n"); print("\n"); @@ -6351,7 +6355,7 @@ print("
Naziv:	$ArticleFolder{'FolderName'}
Opis:	$ArticleFolder{'FolderDescription'}
Datum kreiranja:	$Value
Datum zadnje promijene:	$Value
Datum zadnje promijene:	$Value

Sorry, currently, there are no saved searches.

Trenutno nemate sačuvanih upita!.

Saving a Document Folder:

Čuvanje korisničkog foldera:

Your document folder was successfully saved.

Vaš folder je uspješno sačuvan!

Document Folder:

Korisnički folder: