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

Diff for /loncom/interface/lonsearchcat.pm between versions 1.80 and 1.84

version 1.80, 2001/03/27 02:51:15 version 1.84, 2001/03/27 19:05:02
Line 560  sub advancedsearch { Line 560  sub advancedsearch {
  $customquery=&build_custommetadata_query('custommetadata',   $customquery=&build_custommetadata_query('custommetadata',
       $ENV{'form.custommetadata'});        $ENV{'form.custommetadata'});
     }      }
       my $customshow='';
       if ($ENV{'form.customshow'}) {
    $customshow=$ENV{'form.customshow'};
    $customshow=~s/[^\w\s]//g;
    my @fields=split(/\s+/,$customshow);
    $customshow=join(" ",@fields);
       }
     if (@queries) {      if (@queries) {
  $query=join(" AND ",@queries);   $query=join(" AND ",@queries);
  $query="select * from metadata where $query";   $query="select * from metadata where $query";
  my $reply='';   my $reply='';
  unless ($customquery) {   unless ($customquery or $customshow) {
     $reply=&Apache::lonnet::metadata_query($query);      $reply=&Apache::lonnet::metadata_query($query);
  }   }
  else {   else {
     $reply=&Apache::lonnet::metadata_query($query,$customquery);      $reply=&Apache::lonnet::metadata_query($query,
      $customquery,$customshow);
  }   }
  &output_results('Advanced',$r,$envhash,$customquery,$reply);   &output_results('Advanced',$r,$envhash,$customquery,$reply);
     }      }
     else {      else {
  &output_results('Advanced',$r,$envhash,$query);   &output_results('Advanced',$r,$envhash,$query);
     }      }
       $r->print(' ');
     return OK;      return OK;
 }  }
   
Line 683  sub output_results { Line 692  sub output_results {
     $customshow=~s/[^\w\s]//g;      $customshow=~s/[^\w\s]//g;
     my @fields=map {"<font color=\"#008000\">$_:</font>"}       my @fields=map {"<font color=\"#008000\">$_:</font>"} 
                    split(/\s+/,$customshow);                     split(/\s+/,$customshow);
     $extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";      if ($customshow) {
    $extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";
       }
  }   }
  my $customdata='';   my $customdata='';
  foreach my $result (@results) {   foreach my $result (@results) {
     $result=~/(\&custom.*)$/; # grab all custom metadata      if ($result=~/^(custom\=.*)$/) { # grab all custom metadata
     $customdata=$1;   $customdata.=$result;
     $result=~s/\&custom.*$//; # remove custom metadata      }
  }   }
  foreach my $result (@results) {   foreach my $result (@results) {
       next if $result=~/^custom\=/;
       chomp $result;
     my @fields=map      my @fields=map
                    {&Apache::lonnet::unescape($_)}                     {&Apache::lonnet::unescape($_)}
                    (split(/\,/,$result));                     (split(/\,/,$result));
Removed from v.1.80  
changed lines
  Added in v.1.84

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