[BACK]Return to lonsearchcat.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.177 and 1.178

version 1.177, 2003/06/14 00:15:01 version 1.178, 2003/06/16 19:18:00
Line 1498  sub parse_basic_search { Line 1498  sub parse_basic_search {
     }      }
     # Build SQL query string based on form page      # Build SQL query string based on form page
     my $query='';      my $query='';
     my $concatarg=join(',"    ",',      my $concatarg=join(',',
        ('title', 'author', 'subject', 'notes', 'abstract',         ('title', 'author', 'subject', 'notes', 'abstract',
                         'keywords'));                          'keywords'));
     $concatarg='title' if $ENV{'form.titleonly'};      $concatarg='title' if $ENV{'form.titleonly'};
     $query=&build_SQL_query('concat('.$concatarg.')',$search_string);      $query=&build_SQL_query('concat_ws(" ",'.$concatarg.')',$search_string);
     $pretty_search_string .= "<br />\n";      $pretty_search_string .= "<br />\n";
     return 'select * from metadata where '.$query,$pretty_search_string;      return 'SELECT * FROM metadata WHERE '.$query,$pretty_search_string;
 }  }
   
   
Line 1621  sub recursive_SQL_query_build { Line 1621  sub recursive_SQL_query_build {
         my ($key,$value)=($1,$2);          my ($key,$value)=($1,$2);
         my $replacement='';          my $replacement='';
         if ($key eq 'literal') {          if ($key eq 'literal') {
             $replacement="($dkey like \"\%$value\%\")";              $replacement="($dkey LIKE \"\%$value\%\")";
         } elsif ($key eq 'not') {          } elsif (lc($key) eq 'not') {
             $value=~s/like/not like/;              $value=~s/LIKE/NOT LIKE/;
 #          $replacement="($dkey not like $value)";  #          $replacement="($dkey not like $value)";
             $replacement="$value";              $replacement="$value";
         } elsif ($key eq 'and') {          } elsif ($key eq 'and') {
Line 2130  END Line 2130  END
     my $time_remaining = $max_time - (time - $starttime) ;      my $time_remaining = $max_time - (time - $starttime) ;
     my $last_time = $time_remaining;      my $last_time = $time_remaining;
     &update_seconds($r,$time_remaining);      &update_seconds($r,$time_remaining);
       &update_status($r,'contacting '.$Servers_to_contact[0]);
     while (($time_remaining > 0) &&      while (($time_remaining > 0) &&
            ((@Servers_to_contact) || keys(%Server_status))) {             ((@Servers_to_contact) || keys(%Server_status))) {
         # Send out a search request if it needs to be done.          # Send out a search request if it needs to be done.
Removed from v.1.177  
changed lines
  Added in v.1.178

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>