Diff for /loncom/interface/lonsearchcat.pm between versions 1.87 and 1.88

version 1.87, 2001/03/27 20:33:40 version 1.88, 2001/03/27 21:18:55
Line 696  sub output_results { Line 696  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);
     my @customfields=split(/\s+/,$customshow);      @customfields=split(/\s+/,$customshow);
     if ($customshow) {      if ($customshow) {
  $extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";   $extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";
     }      }
Line 730  sub output_results { Line 730  sub output_results {
  foreach my $field (@customfields) {   foreach my $field (@customfields) {
     my $value='';      my $value='';
     if ($customhash{$url}=~/\<${field}[^\>]*\>(.*?)\<\/${field}[^\>]*\>/s) {      if ($customhash{$url}=~/\<${field}[^\>]*\>(.*?)\<\/${field}[^\>]*\>/s) {
          my $value=$1;           $value=$1;
     }      }
     $extrashow2=~s/\<\!\-\- $field \-\-\>/$value/g;      $extrashow2=~s/\<\!\-\- $field \-\-\>/ $value/g;
  }   }
     }      }
     $compiledresult.=<<END;      $compiledresult.=<<END;
Line 865  sub build_custommetadata_query { Line 865  sub build_custommetadata_query {
     # quick fix to change literal into xml tag-matching      # quick fix to change literal into xml tag-matching
     # will eventually have to write a separate builder module      # will eventually have to write a separate builder module
     my $oldmatchexp=$matchexp;      my $oldmatchexp=$matchexp;
     $matchexp=~s/(\w+)\\\=(\w+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g;      $matchexp=~s/(\w+)\\\=([\w\\\+]+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g;
     return $matchexp;      return $matchexp;
 }  }
   

Removed from v.1.87  
changed lines
  Added in v.1.88


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