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

Diff for /loncom/interface/lonsearchcat.pm between versions 1.18 and 1.20

version 1.18, 2001/03/15 18:43:30 version 1.20, 2001/03/15 18:51:09
Line 77  END Line 77  END
     }      }
   
     if ($ENV{'form.basicsubmit'} eq 'SEARCH') {      if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
  return &basicsearch($r,$ENV{'form.basicexp'});   return &basicsearch($r,\%ENV);
     }      }
     elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {      elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
  return &advancedsearch($r,\%ENV);   return &advancedsearch($r,\%ENV);
Line 428  sub advancedsearch { Line 428  sub advancedsearch {
   
 # --------------------------------------------------- Performing a basic search  # --------------------------------------------------- Performing a basic search
 sub basicsearch {  sub basicsearch {
     my ($r,$expression)=@_;      my ($r,$envhash)=@_;
       my %ENV=%{$envhash};
   
     my $query=$expression;      my $query=$ENV{'form.basicexp'};
     $query="select * from metadata where concat(title,\"    \",author) like '\%$expression\%'";      $query="select * from metadata where concat(title,\"    \",author) like '\%$ENV{'form.basicexp'}\%'";
     my $reply=&Apache::lonnet::metadata_query($query);      my $reply=&Apache::lonnet::metadata_query($query);
     &output_results($reply);      &output_results($r,$envhash,$reply);
     return OK;      return OK;
 }  }
   
 # ----------------------------- format and output results based on a reply list  # ----------------------------- format and output results based on a reply list
 sub output_results {  sub output_results {
     my (@replylist)=@_;      my ($r,$envhash,@replylist)=@_;
       my %ENV=%{$envhash};
     foreach my $reply (@replylist) {      foreach my $reply (@replylist) {
   
  my @results;   my @results;
Line 481  onClick="javascript:select_data('$title' Line 483  onClick="javascript:select_data('$title'
 <br>  <br>
 END  END
             $compiledresult.=<<END;              $compiledresult.=<<END;
 <b>URL: </b> <A HREF="$ENV{'HTTP_HOST'}/$url" TARGET='search_preview'>$url</A>  <b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}/$url" TARGET='search_preview'>$url</A>
 <br>  <br>
 <b>Title:</b> $title<br>  <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>  <b>Author(s):</b> $author<br>
Line 554  $persistent Line 556  $persistent
 <hr>  <hr>
 <h3>Search Query</h3>  <h3>Search Query</h3>
 <p>  <p>
 <b>Basic search:</b> $expression  <b>Basic search:</b> $ENV{'form.basicexp'}
 </p>  </p>
 <h3>Search Results</h3>  <h3>Search Results</h3>
 $compiledresult  $compiledresult
Removed from v.1.18  
changed lines
  Added in v.1.20

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