--- search/Search.cgi 2002/06/25 15:02:32 1.13 +++ search/Search.cgi 2002/06/25 17:48:55 1.19 @@ -392,7 +392,7 @@ print("$JavaScript\n"); } print ''; - print ''; + print ''; print("\n\n"); @@ -506,20 +506,20 @@ my $DISABLED; $DISABLED = ( %MenuBar && defined($MenuBar{'GetSearch'}) ) ? "DISABLED" : ""; - print(""); + print(""); if ( defined($main::RemoteUser) ) { $DISABLED = ( %MenuBar && defined($MenuBar{'ListSearchHistory'}) ) ? "DISABLED" : ""; - print""; + print""; $DISABLED = ( %MenuBar && defined($MenuBar{'ListSavedSearch'}) ) ? "DISABLED" : ""; - print""; + print""; $DISABLED = ( %MenuBar && defined($MenuBar{'ListFolder'}) ) ? "DISABLED" : ""; - print""; + print""; $DISABLED = ( %MenuBar && defined($MenuBar{'GetUserSettings'}) ) ? "DISABLED" : ""; - print""; + print""; } @@ -1519,22 +1519,26 @@ my ($FieldName) = "FieldName" . $Value; my ($FieldContent) = "FieldContent" . $Value; + - - if ( defined($Content{$FieldName}) ) { - $SearchString .= defined($Content{$FieldContent}) ? - (($SearchString ne "") ? " AND " : "") . "$Content{$FieldName}=(" . $Content{$FieldContent} . ")" : ""; + 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} . ")"; } } - # nuke accented chars - $SearchString =~ tr/ÇüéâäůćçłëŐőîŹÄĆÉĹĺôöĽľŚśÖÜŤťŁčáíóúĄąŽžĘęźČşÁÂĚŞŻżĂăđĐĎËďŇÍÎěŢŮÓÔŃńňŠšŔÚŕŰýÝţ´˝˛ˇ˘¸¨˙Řř/CueaauccleOoiZACELlooLlSsOUTtLcaiouAaZzEezCsAAESZzAadDDEdNIIeTUOoNnnSsRUrUyYt'-".'',"'Rr/; - # convert search string to lower case -> make search case insensitive - $SearchString =~ tr/A-Z/a-z/; - # Add the internal search terms - # Add the date restriction on the load time if ( defined($Content{'LastRunTime'}) && ($Content{'LastRunTime'} > 0) ) { $SearchString .= (($SearchString ne "") ? " AND " : "") . "time_t>=$Content{'LastRunTime'}"; @@ -2932,24 +2936,9 @@ # Make sure that we send the header - $Value = ($ENV{'PATH_INFO'} eq "/GetExpandedSearch") ? "Pretraživanje s više kriterija" : "Jednostavno pretraživanje"; - my $JavaScript = ' - '; + $Value = ($ENV{'PATH_INFO'} eq "/GetExpandedSearch") ? "Složeno pretraživanje" : "Jednostavno pretraživanje"; - &vSendHTMLHeader($Value, $JavaScript); + &vSendHTMLHeader($Value, $main::JavaScript_SetChecked); undef(%Value); $Value{'GetSearch'} = "GetSearch"; @@ -2988,11 +2977,11 @@ if ( $ENV{'PATH_INFO'} eq "/GetExpandedSearch" ) { print("\n"); - print(" Kliknite na trokutić da biste suzili formu.\n"); + print(" Jednostavo pretraživanje (kliknite na trokutić)\n"); } else { print("\n"); - print(" Kliknite na trokutić da biste proširili formu.\n"); + print(" Složeno pretraživanje (kliknite na trokutić)\n"); } print("\n"); @@ -3020,11 +3009,13 @@ for (my $field=1; $field<= $nr_fields; $field++) { - print(""); + print ""; if ($field == 1 ) { - print ("Pretraži u određenom polju:"); + print ""; + print "Pretraži u odabranom polju:"; + print ""; } - print (""); + print (""); print (" \n"); + print(" \n"); } @@ -3064,13 +3055,8 @@ # Database selection if ( %main::DatabaseDescriptions ) { - print(" Odaberite bazu koju želite pretraživati: - - Označi - sve, - niti jednu. - - + print(" Odaberite knjižnicu čiji fond želite pretraživati: + "); # Parse out the database names and put them into a @@ -3294,11 +3280,11 @@ # Check that at least one database was selected if ( !defined($main::FormData{'Database'}) ) { - print("

Database Search:

\n"); - print("

Sorry, no database(s) were selected for searching.

\n"); + print("

Pretraživanje baza:

\n"); + print("

Niste odabrali knjižnicu koju želite pretraživati.

\n"); print("

\n"); - print("There needs to be a least one database selected in order to perform the search.\n"); - print("Click 'back' on your browser, select at least one database and try again.\n"); + print("Potrebno je da barem jedna knjižnica bude odabrana, kako biste mogli pretraživati.\n"); + print("Kliknite na 'back' u svom browseru, odaberite barem jednu knjižnicu i pokušajte ponovo.\n"); goto bailFromGetSearchResults; } @@ -3971,7 +3957,7 @@ # Make sure that we send the header - &vSendHTMLHeader("My Settings", undef); + &vSendHTMLHeader("My Settings", $main::JavaScript_SetChecked); undef(%Value); $Value{'GetUserSettings'} = "GetUserSettings"; &vSendMenuBar(%Value); @@ -4009,7 +3995,7 @@ print("

Postavke:

\n"); print("\n"); - print("\n"); + print("\n"); # Send the buttons print("\n"); @@ -4071,14 +4057,14 @@ print("\n"); - print("\n"); @@ -4224,7 +4210,7 @@ $Value{'UserName'} = $main::FormData{'UserName'}; $Value{'EmailAddress'} = $main::FormData{'EmailAddress'}; $Value{'DefaultSearch'} = $main::FormData{'DefaultSearch'}; - $Value{'SelectedDatabases'} = $main::FormData{'SelectedDatabases'}; + $Value{'SelectedDatabases'} = $main::FormData{'Database'}; if ( defined($Value{'SelectedDatabases'}) ) { $Value{'SelectedDatabases'} =~ s/\0/,/g; } @@ -5034,9 +5020,9 @@ print("\n"); @@ -5271,13 +5257,13 @@ # Set the title if ( $ENV{'PATH_INFO'} eq "/DeleteSavedSearch" ) { - $Title = "Obriši sačuvana pretraživanja"; + $Title = "Brisanje sačuvanih pretraživanja"; } elsif ( $ENV{'PATH_INFO'} eq "/ActivateSavedSearch" ) { - $Title = "Aktiviraj sačuvana pretraživanja"; + $Title = "Uključivanje automatskog periodičnog pretraživanja"; } elsif ( $ENV{'PATH_INFO'} eq "/SuspendSavedSearch" ) { - $Title = "Stavi u mirovanje sačuvana pretraživanja"; + $Title = "Isključivanje automatskog periodičnog pretraživanja"; } @@ -5292,9 +5278,9 @@ # Check to see if the saved search object is defined if ( ! defined($main::FormData{'SavedSearchObject'}) ) { # Could not find the saved search object - print("

Sorry, no searches were selected.

\n"); + print("

Niste odabrali niti jedno pretraživanje.

\n"); print("

\n"); - print("You need to select at least one saved search in order to be able to perform an action on it.\n"); + print("Potrebno je odabrati barem jedno pretraživanje nad kojim će se izvršiti akcija.\n"); print("

\n"); goto bailFromProcessSavedSearch; } @@ -5323,10 +5309,10 @@ if ( $ENV{'PATH_INFO'} eq "/DeleteSavedSearch" ) { if ( unlink($SavedSearchFilePath) ) { - printf("

Successfully deleted: %s\n", $Value{'SearchName'}); + printf("

Uspješno pobrisano: %s\n", $Value{'SearchName'}); } else { - printf("

Failed to delete: %s\n", $Value{'SearchName'}); + printf("

Nije pobrisano: %s\n", $Value{'SearchName'}); } } elsif ( ($ENV{'PATH_INFO'} eq "/ActivateSavedSearch") || ($ENV{'PATH_INFO'} eq "/SuspendSavedSearch") ) { @@ -5340,12 +5326,12 @@ $Value{'SearchStatus'} = ($ENV{'PATH_INFO'} eq "/ActivateSavedSearch") ? "Active" : "Inactive" ; if ( &iSaveXMLFileFromHash($SavedSearchFilePath, "SavedSearch", %Value) ) { - printf("

Successfully %s: %s\n", - ($ENV{'PATH_INFO'} eq "/ActivateSavedSearch") ? "activated" : "suspended", $Value{'SearchName'}); + printf("

Uspješno %s: %s\n", + ($ENV{'PATH_INFO'} eq "/ActivateSavedSearch") ? "uključeno" : "isključeno", $Value{'SearchName'}); } else { - printf("

Failed to %s: %s\n", - ($ENV{'PATH_INFO'} eq "/ActivateSavedSearch") ? "activated" : "suspended", $Value{'SearchName'}); + printf("

Nije %s: %s\n", + ($ENV{'PATH_INFO'} eq "/ActivateSavedSearch") ? "uključeno" : "isključeno", $Value{'SearchName'}); } } } @@ -7403,6 +7389,12 @@ } print("


Odabrane baze:
Označite baze koje uvijek želite pretraživati:	\n"); + print("
Označite baze koje uvijek želite pretraživati:
\n"); # Parse out the database names and put them into a # hash table, they should be separated with a '\n' if ( defined($SelectedDatabases) && ($SelectedDatabases ne "") ) { @ItemList = split(",", $SelectedDatabases); } - + &ShowDatabaseCheckBoxes(@ItemList); print("
\n"); print("\n"); print("\n"); print("

\n"); + print ""; my @html_database;

+ Označi + sve, + niti jednu. + +