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

Diff for /loncom/interface/lonsearchcat.pm between versions 1.44 and 1.45

version 1.44, 2001/03/20 17:49:03 version 1.45, 2001/03/21 00:32:33
Line 448  sub selectbox { Line 448  sub selectbox {
     return $selout.'</select>';      return $selout.'</select>';
 }  }
   
 # ------------------------------------------------ Performing a advanced search  # ----------------------------------------------- Performing an advanced search
 sub advancedsearch {  sub advancedsearch {
     my ($r,$envhash)=@_;      my ($r,$envhash)=@_;
     my %ENV=%{$envhash};      my %ENV=%{$envhash};
Line 469  sub advancedsearch { Line 469  sub advancedsearch {
   
     my $query='';      my $query='';
   
     my $testquery='';      my @queries;
     # Go through logical expression AND/OR/NOT phrase fields.      # Go through logical expression AND/OR/NOT phrase fields.
     foreach my $field ('title','author','subject','notes','abstract') {      foreach my $field ('title','author','subject','notes','abstract') {
  if ($ENV{'form.'.$field}) {   if ($ENV{'form.'.$field}) {
     $testquery=build_SQL_query($field,$ENV{'form.'.$field});      push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
  }   }
     }      }
       if (@queries) {
 #    my $concatarg=join(',"    ",',   $query="(" . (join(") and ("),@queries) . ")";
 #       ('title', 'author', 'subject', 'notes', 'abstract'));   $query="select * from metadata where $testquery";
    my $reply=&Apache::lonnet::metadata_query($query);
     $query="select * from metadata where $testquery";   &output_results('Advanced',$r,$envhash,$query,$reply);
       }
     my $reply=&Apache::lonnet::metadata_query($query);      else {
    &output_results('Advanced',$r,$envhash,$query);
     &output_results('Advanced',$r,$envhash,$query,$reply);      }
     return OK;      return OK;
 }  }
   
Removed from v.1.44  
changed lines
  Added in v.1.45

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