/[webpac-proto]/search/Search.cgi

This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!

Diff of /search/Search.cgi

Parent Directory | Revision Log | View Patch Patch

-revision 1.22 by dpavlin,
Tue Jul  2 17:18:43 2002 UTC
+revision 1.26 by dpavlin,
Thu Oct 24 18:25:20 2002 UTC
 Line 1509 
 sub sMakeSearchString {
          # Initialize the search string
          $SearchString = "";
- sub nuke_accents {
+         # tip gradje
-         my $tmp = $_[0];
+         if ( defined($main::FormData{'tip'}) ) {
-         $tmp =~ tr/Çüéâäùæç³ëÕõî¬ÄÆÉÅåôö¥µ¦¶ÖÜ«»£èáíóú¡±®¾Êê¼ÈºÁÂÌª¯¿ÃãðÐÏËïÒÍÎìÞÙÓÔÑñò©¹ÀÚàÛýÝþ´½²·¢¸¨ÿØø/CueaauccleOoiZACELlooLlSsOUTtLcaiouAaZzEezCsAAESZzAadDDEdNIIeTUOoNnnSsRUrUyYt'-".'',"'Rr/;
+                 my @t;
-         # convert search string to lower case -> make search case insensitive
+                 foreach my $tip ( split(/\0/, $main::FormData{'tip'}) ) {
-         $tmp =~ tr/A-Z/a-z/;
+                         push @t,"tip=$tip";
-         return $tmp;
+                 }
- }
+                 $SearchString .= "(".join(" or ",@t).") and ";
+         }
          # Add the search terms
          $SearchString .= defined($Content{'Any'}) ? ((($SearchString ne "") ? " AND " : "") . nuke_accents($Content{'Any'}) ) : "";
 Line 2998 
 sub vGetSearch {
          # Send the start of the form and the buttons
          print("<TD ALIGN=RIGHT VALIGN=TOP>\n");
-         print("<FORM ACTION=\"$ENV{'SCRIPT_NAME'}/GetSearchResults\" NAME=\"Search\" METHOD=POST> <INPUT TYPE=SUBMIT VALUE=\"Pretra¾i bazu\"> <INPUT TYPE=RESET VALUE=\"Pobri¹i polja\">\n");
+         print("<FORM ACTION=\"$ENV{'SCRIPT_NAME'}/GetSearchResults\" NAME=\"Search\" METHOD=POST> <INPUT TYPE=SUBMIT VALUE=\"Pretra¾i bazu\"> <INPUT TYPE=RESET VALUE=\"Vrati poèetne vrijednosti\">\n");
          print("</TD></TR>\n");
          print("<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=3><BR></TD></TR>\n");
 Line 3035 
 sub vGetSearch {
                          } elsif ($i == ($field - 1)) {
                                  $Selected = "SELECTED";
                          }
                          print("<OPTION VALUE=\"$ItemEntry\" $Selected> $main::SearchFieldDescriptions{$ItemEntry}\n");
                  }
                  my $Value = "";
-Line 3056 
 sub vGetSearch {
+Line 3055 
 sub vGetSearch {
          print("<OPTION VALUE=\"OR\" $Value> Bilo koju rijeè (OR)\n");
          print("</SELECT> </TD></TR>\n");
+         print "<tr><td align=left valign=top> Prika¾i samo tip graðe: </td><td align=left valign=top colspan=2>";
+         foreach my $tip (keys %default::tip) {
+                 print '<input TYPE="checkbox" NAME="tip" VALUE="',nuke_accents($default::tip{$tip}),'" >',$default::tip{$tip},"&nbsp&nbsp;";
+         }
+         print "</td></tr>\n";
          print("<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=3><HR WIDTH=50%></TD></TR>\n");
-Line 3176 
 sub vGetSearch {
+Line 3180 
 sub vGetSearch {
          print("<TR><TD ALIGN=CENTER VALIGN=TOP COLSPAN=3><HR WIDTH=50%></TD></TR>\n");
-         print("<TR><TD ALIGN=RIGHT COLSPAN=3><INPUT TYPE=SUBMIT VALUE=\"Pretra¾i bazu\"> <INPUT TYPE=RESET VALUE=\"Pobri¹i polja\"></TD></TR>\n");
+         print("<TR><TD ALIGN=RIGHT COLSPAN=3><INPUT TYPE=SUBMIT VALUE=\"Pretra¾i bazu\"> <INPUT TYPE=RESET VALUE=\"Vrati poèetne vrijednosti\"></TD></TR>\n");
          print("</FORM>\n");
          print("</TABLE>\n");
-Line 3223 
 sub vGetSearchResults {
+Line 3227 
 sub vGetSearchResults {
          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
-Line 3279 
 sub vGetSearchResults {
+Line 3281 
 sub vGetSearchResults {
                  $main::FormData{'Database'} = join("\0", keys(%Databases));
          }
+         # now add all databases that had to be included always
+         foreach (my $db = @main::always_selected_databases) {
+                 $Databases{$db} = $Value{$db};
+         }
          # Make sure that we send the header
          &vSendHTMLHeader("Rezultati pretra¾ivanja", undef);
          undef(%Value);
          &vSendMenuBar(%Value);
          # Check that at least one database was selected
-         if ( !defined($main::FormData{'Database'}) ) {
+         if ( !defined($main::FormData{'Database'}) && $#main::always_selected_databases < 0 ) {
                  print("<H3>Pretra¾ivanje baza:</H3>\n");
                  print("<H3><CENTER>Niste odabrali knji¾nicu koju ¾elite pretra¾ivati.</CENTER></H3>\n");
                  print("<P>\n");
-Line 3322 
 sub vGetSearchResults {
+Line 3326 
 sub vGetSearchResults {
          # Convert all the '\0' to ','
          $Databases =~ tr/\0/,/;
+         # add always selected databases
+         if (@main::always_selected_databases) {
+                 $Databases .= ",".join(",",@main::always_selected_databases);
+         }
          # Add the max doc restriction
          if ( !defined($main::FormData{'Max'}) ) {
                  $main::FormData{'Max'} = $main::DefaultMaxDoc;
          }
          # Generate the search string
          $SearchString = &sMakeSearchString(%main::FormData);
-Line 7380 
 sub fill_SearchFieldDescriptions_fromDB
+Line 7387 
 sub fill_SearchFieldDescriptions_fromDB
                          my ($FieldName, $FieldDescription, undef) = split(/\t/, $FieldInformation, 3);
                          $main::SearchFieldDescriptions{$FieldName} = $FieldDescription;
                  }
+         } else {
+                 &vLog("Error - cant read database description from '$Database'\n");
          }
  }
-Line 7396 
 sub ShowDatabaseCheckBoxes {
+Line 7405 
 sub ShowDatabaseCheckBoxes {
          foreach my $ItemEntry ( @_ ) {
                  $Value{$ItemEntry} = $ItemEntry;
          }
          print("<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>\n");
          print "<tr><td colspan=3 align=\"center\">
                  <font size=-1>Oznaèi
-Line 7440 
 sub ShowDatabaseCheckBoxes {
+Line 7449 
 sub ShowDatabaseCheckBoxes {
          }
          print("</TABLE>\n");
  }
+ #--------------------------------------------------------------------------
+ #
+ 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;
+ }

 Legend:



Removed from v.1.22
 


changed lines


 
Added in v.1.26
 Legend:



Removed from v.1.22
 


changed lines


 
Added in v.1.26
-Removed from v.1.22
+Added in v.1.26

	ViewVC Help
Powered by ViewVC 1.1.26