[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.48

version 1.44, 2001/03/20 17:49:03 version 1.48, 2001/03/21 01:10:28
Line 51  my $scrout; Line 51  my $scrout;
 my %metadatafields;  my %metadatafields;
 my %cprtag;  my %cprtag;
 my %mimetag;  my %mimetag;
   my $closebutton;
   my $viewselect=<<END;
   <select name='view'>
   <option value='Detailed View'>Detailed View</option>
   <option value='Brief View'>Brief View</option>
   </select>
   END
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 76  sub handler { Line 83  sub handler {
 <input type='hidden' name='catalogmode' value='interactive'>  <input type='hidden' name='catalogmode' value='interactive'>
 END  END
   
       $closebutton=<<END if $ENV{'form.catalogmode'} eq 'interactive';
   <input type="button" name="close" value="CLOSE" onClick="self.close()">
   END
   
 # ------------------------------------------------ First, check out environment  # ------------------------------------------------ First, check out environment
     $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};      $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
   
Line 248  ENDDOCUMENT Line 259  ENDDOCUMENT
 <br>  <br>
 <input type="submit" name="basicsubmit" value="SEARCH">  <input type="submit" name="basicsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">  <input type="reset" name="reset" value="RESET">
 <input type="button" name="close" value="CLOSE" onClick="self.close()">  $closebutton
   $viewselect
 </p>  </p>
 <hr>  <hr>
 <h3>Advanced Search</h3>  <h3>Advanced Search</h3>
Line 256  $scrout Line 268  $scrout
 <p>  <p>
 <input type="submit" name="advancedsubmit" value="SEARCH">  <input type="submit" name="advancedsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">  <input type="reset" name="reset" value="RESET">
 <input type="button" name="close" value="CLOSE" onClick="self.close()">  $closebutton
   $viewselect
 </p>  </p>
 </form>  </form>
 </body>  </body>
Line 448  sub selectbox { Line 461  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 482  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 $query";
    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;
 }  }
   
Line 549  BEGINNING Line 562  BEGINNING
 $persistent  $persistent
 <input type='button' value='Revise search request'  <input type='button' value='Revise search request'
 onClick='this.form.submit();'>  onClick='this.form.submit();'>
 <input type='button' value='CLOSE'  $closebutton
 onClick='self.close();'>  
 <hr>  <hr>
 <h3>Helpful Message</h3>  <h3>Helpful Message</h3>
 <p>  <p>
Line 676  SCRIPT Line 688  SCRIPT
 <form method="post" action="/adm/searchcat">  <form method="post" action="/adm/searchcat">
 <input type='button' value='Revise search request'  <input type='button' value='Revise search request'
 onClick='this.form.submit();'>  onClick='this.form.submit();'>
 <input type='button' value='CLOSE'  $closebutton
 onClick='self.close();'>  
 $persistent  $persistent
 <hr>  <hr>
 <h3>Search Query</h3>  <h3>Search Query</h3>
Removed from v.1.44  
changed lines
  Added in v.1.48

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