--- search/Search.cgi 2002/06/25 13:48:12 1.11
+++ search/Search.cgi 2002/07/02 17:18:43 1.22
@@ -232,25 +232,6 @@
$main::QueryReportMimeType = "application/x-wais-report";
-
-# Hash of icon/images names that we use
-%main::ImageNames = (
- 'banner', 'banner.gif',
- 'collapse', 'collapse.gif',
- 'expand', 'expand.gif',
- 'inactive-search', 'inactive-search.gif',
- 'active-search', 'active-search.gif',
- 'inactive-search-history', 'inactive-search-history.gif',
- 'active-search-history', 'active-search-history.gif',
- 'inactive-saved-searches', 'inactive-saved-searches.gif',
- 'active-saved-searches', 'active-saved-searches.gif',
- 'inactive-document-folders','inactive-document-folders.gif',
- 'active-document-folders', 'active-document-folders.gif',
- 'inactive-settings', 'inactive-settings.gif',
- 'active-settings', 'active-settings.gif',
-);
-
-
# Array of mime type names, we use this to map
# mime types to mime type names (which are more readable)
%main::MimeTypeNames = (
@@ -411,7 +392,8 @@
print("$JavaScript\n");
}
print '';
- print("\n
\n");
+ print '';
+ print("\n\n");
# Send the header snippet file
@@ -521,47 +503,23 @@
}
}
- if ( %MenuBar && defined($MenuBar{'GetSearch'}) ) {
- print("");
-
-
- }
- else {
+ my $DISABLED;
- print("");
-
-
-
- }
+ $DISABLED = ( %MenuBar && defined($MenuBar{'GetSearch'}) ) ? "DISABLED" : "";
+ print("");
if ( defined($main::RemoteUser) ) {
- if ( %MenuBar && defined($MenuBar{'ListSearchHistory'}) ) {
- print("");
- }
- else {
- print("");
- }
+ $DISABLED = ( %MenuBar && defined($MenuBar{'ListSearchHistory'}) ) ? "DISABLED" : "";
+ print"";
- if ( %MenuBar && defined($MenuBar{'ListSavedSearch'}) ) {
- print("");
- }
- else {
- print("");
- }
+ $DISABLED = ( %MenuBar && defined($MenuBar{'ListSavedSearch'}) ) ? "DISABLED" : "";
+ print"";
- if ( %MenuBar && defined($MenuBar{'ListFolder'}) ) {
- print("");
- }
- else {
- print("");
- }
-
- if ( %MenuBar && defined($MenuBar{'GetUserSettings'}) ) {
- print("");
- }
- else {
- print("");
- }
+ $DISABLED = ( %MenuBar && defined($MenuBar{'ListFolder'}) ) ? "DISABLED" : "";
+ print"";
+
+ $DISABLED = ( %MenuBar && defined($MenuBar{'GetUserSettings'}) ) ? "DISABLED" : "";
+ print"";
}
@@ -1551,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
@@ -1561,22 +1527,22 @@
my ($FieldName) = "FieldName" . $Value;
my ($FieldContent) = "FieldContent" . $Value;
+
+ if ( defined($Content{$FieldName}) && defined($Content{$FieldContent}) ) {
- if ( defined($Content{$FieldName}) ) {
- $SearchString .= defined($Content{$FieldContent}) ?
- (($SearchString ne "") ? " AND " : "") . "$Content{$FieldName}=(" . $Content{$FieldContent} . ")" : "";
+ if ($Content{$FieldName} eq "ISBN") {
+ # fix stupid problem with dashes in data
+ $Content{$FieldContent} .= "*";
+ }
+
+ $SearchString .= ($SearchString ne "") ? " AND " : "";
+ $SearchString .= "$Content{$FieldName}=(" . nuke_accents($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'}";
@@ -1996,10 +1962,12 @@
# Print the title
if ( $HTML ) {
printf("%s%s: | \n",
- defined($Title) ? $Title : "Document", (scalar(@Documents) > 1) ? "s" : "");
+# defined($Title) ? $Title : "Document", (scalar(@Documents) > 1) ? "s" : "");
+ $Title);
}
else {
- printf("%s%s:\n", defined($Title) ? $Title : "Document", (scalar(@Documents) > 1) ? "s" : "");
+# printf("%s%s:\n", defined($Title) ? $Title : "Document", (scalar(@Documents) > 1) ? "s" : "");
+ print $Title;
}
@@ -2020,6 +1988,8 @@
$Headline =~ s/ //gs;
$Headline =~ s/<.*?>//gs;
$Headline =~ s/\s+/ /gs;
+ # decode some basic html from headline
+ $Headline =~ s/<(\/?[bi])>/<$1>/g;
# Create a generic link for this document
$Value = "";
@@ -2050,7 +2020,8 @@
# Put up the headline and the score, this one links to the document
if ( $HTML ) {
- print("$SelectorText $Headline ( $main::DatabaseDescriptions{$Value{'Database'}} ) \n");
+# print("$SelectorText $Headline ( $main::DatabaseDescriptions{$Value{'Database'}} ) \n");
+ print("$SelectorText $Headline \n");
# if ( defined($URL) && ($URL ne "") ) {
# $Value = (length($URL) > $main::DefaultMaxVisibleUrlLength) ? substr($URL, 0, $main::DefaultMaxVisibleUrlLength) . "..." : $URL;
@@ -2230,7 +2201,7 @@
print("\n");
# Print the selector
- print("Odabranima se smatraju svi rezultati ukoliko niste učinili nikakav dodatan odabir. | \n");
+ print(" | Odabrani su svi rezultati ukoliko niste učinili nikakav dodatan odabir. | \n");
if ( $ResultCount > 0 ) {
@@ -2245,7 +2216,7 @@
if ( $main::ConfigurationData{'allow-relevance-feedback-searches'} eq "yes" ) {
print(" | \n");
@@ -2695,7 +2666,7 @@
print(" $SelectorText | $Headline ");
} else {
- printf("%3d $Headline ($main::DatabaseDescriptions{$Database})\n", $Score);
+ printf("%3d $Headline \n", $Score);
}
if (0) { ## don't display description
@@ -2974,24 +2945,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";
@@ -3030,11 +2986,11 @@
if ( $ENV{'PATH_INFO'} eq "/GetExpandedSearch" ) {
print("\n");
- print(" Kliknite na trokutić da biste suzili formu.\n");
+ print(" Jednostavno 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");
@@ -3062,11 +3018,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");
}
@@ -3106,13 +3064,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
@@ -3178,7 +3131,7 @@
# Send the end date
- print(" |
Ograniči na knjige izdane prije godine:: | |