Diff for /loncom/interface/lonsearchcat.pm between versions 1.14 and 1.34

version 1.14, 2001/03/15 14:20:13 version 1.34, 2001/03/15 20:11:18
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') {
    return &advancedsearch($r,\%ENV);
     }      }
   
     $scrout=''; # building a part of screen output      $scrout=''; # building a part of screen output
Line 178  For author-specific metadata, enter in a Line 181  For author-specific metadata, enter in a
 <br>  <br>
 CUSTOMMETADATA  CUSTOMMETADATA
 $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});  $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
 $scrout.='<i>initial users of this system do not need to worry about this option</i>';  $scrout.=' <i>initial users of this system do not need to worry about this option</i>';
   
 # ---------------------------------------------------------------- Print screen  # ---------------------------------------------------------------- Print screen
     $r->print(<<ENDDOCUMENT);      $r->print(<<ENDDOCUMENT);
Line 416  sub selectbox { Line 419  sub selectbox {
     return $selout.'</select>';      return $selout.'</select>';
 }  }
   
   # ------------------------------------------------ Performing a advanced search
   sub advancedsearch {
       my ($r,$envhash)=@_;
       my %ENV=%{$envhash};
   
       my $fillflag=0;
       for my $field ('title','author','subject','keywords','url','version',
      'notes','abstract','mime','language','owner',
      'custommetadata') {
    if (&filled($ENV{'form.basicexp'})) {
       $fillflag++;
    }
       }
   
       unless ($fillflag) {
    &output_blank_field_error($r);
    return OK;
       }
   
       $r->print(<<END);
   Advanced searching is not yet implemented.
   END
       return OK;
   }
   
   # ---------------------------------------------------- see if a field is filled
   sub filled {
       my ($field)=@_;
       if ($field=~/\S/) {
    return 1;
       }
       else {
    return 0;
       }
   }
   
 # --------------------------------------------------- Performing a basic search  # --------------------------------------------------- Performing a basic search
 sub basicsearch {  sub basicsearch {
     my ($r,$expression)=@_;      my ($r,$envhash)=@_;
       my %ENV=%{$envhash};
   
       unless (&filled($ENV{'form.basicexp'})) {
    &output_blank_field_error($r);
    return OK;
       }
   
       my $query=$ENV{'form.basicexp'};
       my $concatarg=join(',"    ",',
          ('title', 'author', 'subject', 'notes', 'abstract'));
   
     my $query=$expression;      $query="select * from metadata where concat($concatarg) like '\%$ENV{'form.basicexp'}\%'";
     $query="select * from metadata where concat(title,\"    \",author) like '\%$expression\%'";  
 #    my $reply=&Apache::lonnet::reply("querysend:$query",'msul3');  
     my $reply=&Apache::lonnet::metadata_query($query);      my $reply=&Apache::lonnet::metadata_query($query);
       &output_results($r,$envhash,$concatarg,$reply);
       return OK;
   }
   
     my @results;  sub output_blank_field_error {
       my ($r)=@_;
       # make query information persistent to allow for subsequent revision
       my $persistent='';
       map {
    if (/^form\./ && !/submit/) {
       my $name=$_;
       my $key=$name;
       $name=~s/^form\.//;
       $persistent.=<<END;
   <INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'>
   END
           }
       } (keys %ENV);
   
     my $replyfile='';      $r->print(<<BEGINNING);
     $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting  <html>
     $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;  <head>
     $reply=~/(.*?)\_/;  <title>The LearningOnline Network with CAPA</title>
     my $hostname=$1;  BEGINNING
       $r->print(<<RESULTS);
     {  </head>
  while (1) {  <body bgcolor="#ffffff">
     last if -e $replyfile;  <img align=right src=/adm/lonIcons/lonlogos.gif>
     sleep 1;  <h1>Search Catalog</h1>
   <form method="post" action="/adm/searchcat">
   $persistent
   <input type='button' value='Revise search request'
   onClick='this.form.submit();'>
   <input type='button' value='CLOSE'
   onClick='self.close();'>
   <hr>
   <h3>Helpful Message</h3>
   <p>
   Incorrect search query due to blank entry fields.
   You need to fill in the relevant
   fields on the search page in order for a query to be
   processed.
   </p>
   </body>
   </html>
   RESULTS
   }
   
   # ----------------------------- format and output results based on a reply list
   sub output_results {
       my ($r,$envhash,$testval,@replylist)=@_;
       my %ENV=%{$envhash};
       foreach my $reply (@replylist) {
   
    my @results;
   
    my $replyfile='';
    $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting
    $replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
    $reply=~/(.*?)\_/;
    my $hostname=$1;
   
    {
       while (1) {
    last if -e $replyfile;
    sleep 1;
       }
       # QUESTION: how should I handle this error condition..
       # I'm sure there is syntax elsewhere I can use..
       my $fh=Apache::File->new($replyfile) or
    ($r->print('file cannot be opened') and return OK);
       @results=<$fh>;
  }   }
  # QUESTION: how should I handle this error condition..  
  # I'm sure there is syntax elsewhere I can use..   my $compiledresult='';
  my $fh=Apache::File->new($replyfile) or  
        ($r->print('file cannot be opened') and return OK);   foreach my $result (@results) {
        @results=<$fh>;      my ($title,$author,$subject,$url,$keywords,$version,
     }   $notes,$abstract,$mime,$lang,
    $creationdate,$lastrevisiondate,$owner,$copyright
     my $compiledresult='';   )=map {&Apache::lonnet::unescape($_)} (split(/\,/,$result));
       my $shortabstract=$abstract;
     foreach my $result (@results) {      $shortabstract=substr($abstract,0,200) if length($abstract)>200;
  my ($title,$author,$subject,$url,$keywords,$version,      $compiledresult.=<<END;
     $notes,$abstract,$mime,$lang,  
     $creationdate,$lastrevisiondate,$owner,$copyright  
     )=map {&Apache::lonnet::unescape($_)} (split(/\,/,$result));  
  my $shortabstract=$abstract;  
  $shortabstract=substr($abstract,0,200) if length($abstract)>200;  
  $compiledresult.=<<END;  
 <p>  <p>
 END  END
  $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';              $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';
 <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"  <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
 onClick="javascript:select_data('$title','$url')">  onClick="javascript:select_data('$title','$url')">
 </font>  </font>
 <br>  <br>
 END  END
         $compiledresult.=<<END;              $compiledresult.=<<END;
 <b>URL: </b> $url<br>  <b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>
   <br>
 <b>Title:</b> $title<br>  <b>Title:</b> $title<br>
 <b>Author(s):</b> $author<br>  <b>Author(s):</b> $author<br>
 <b>Subject:</b> $subject<br>  <b>Subject:</b> $subject<br>
Line 480  END Line 581  END
 <b>Repository Location:</b> $hostname  <b>Repository Location:</b> $hostname
 </p>  </p>
 END  END
 }          }
   
     unless ($compiledresult) {   unless ($compiledresult) {
  $compiledresult="There were no results that matched your query";      $compiledresult="There were no results that matched your query";
     }   }
   
     # make query information persistent to allow for subsequent revision   # make query information persistent to allow for subsequent revision
     my $persistent='';   my $persistent='';
     map {   map {
  if (/^form\./ && !/submit/) {      if (/^form\./ && !/submit/) {
     my $name=$_;   my $name=$_;
     my $key=$name;   my $key=$name;
     $name=~s/^form\.//;   $name=~s/^form\.//;
     $persistent.=<<END;   $persistent.=<<END;
 <INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'>  <INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'>
 END  END
         }              }
     } (keys %ENV);   } (keys %ENV);
   
     $r->print(<<BEGINNING);   $r->print(<<BEGINNING);
 <html>  <html>
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 BEGINNING  BEGINNING
     $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';          $r->print(<<SCRIPT) if $ENV{'form.catalogmode'} eq 'interactive';
 <script>  <script>
     function select_data(title,url) {      function select_data(title,url) {
  changeTitle(title);   changeTitle(title);
Line 522  BEGINNING Line 623  BEGINNING
     }      }
 </script>  </script>
 SCRIPT  SCRIPT
     $r->print(<<RESULTS);          $r->print(<<RESULTS);
 </head>  </head>
 <body bgcolor="#ffffff">  <body bgcolor="#ffffff">
 <img align=right src=/adm/lonIcons/lonlogos.gif>  <img align=right src=/adm/lonIcons/lonlogos.gif>
 <h1>Search Catalog</h1>  <h1>Search Catalog</h1>
   $testval
 <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();'>
Line 536  $persistent Line 638  $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
 </body>  </body>
 </html>  </html>
 RESULTS  RESULTS
       }
     return OK;  
 }  }
   
 1;  1;

Removed from v.1.14  
changed lines
  Added in v.1.34


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