[BACK]Return to lonsql CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lonsql between versions 1.11 and 1.19

version 1.11, 2001/03/26 19:46:47 version 1.19, 2001/03/27 02:22:02
Line 234  sub make_new_child { Line 234  sub make_new_child {
     else {      else {
  my $r1=$sth->fetchall_arrayref;   my $r1=$sth->fetchall_arrayref;
  my @r2; map {my $a=$_; my @b=map {escape($_)} @$a; push @r2,join(",", @b)} (@$r1);   my @r2; map {my $a=$_; my @b=map {escape($_)} @$a; push @r2,join(",", @b)} (@$r1);
  $result=join("&",@r2) . "\n";   $result=join("&",@r2);
     }      }
   
     # do custom metadata searching here and build into result      # do custom metadata searching here and build into result
Line 248  sub make_new_child { Line 248  sub make_new_child {
  # if file is not in sql database, output error.   # if file is not in sql database, output error.
  # if file is indicated in sql database and is   # if file is indicated in sql database and is
  # part of query result list, then do the pattern match.   # part of query result list, then do the pattern match.
    my $customresult='';
  foreach my $m (@metalist) {   foreach my $m (@metalist) {
     my $fh=IO::File->new($m);      my $fh=IO::File->new($m);
     my @lines=<$fh>;      my @lines=<$fh>;
     my $stuff=join('',@lines);      my $stuff=join('',@lines);
     if ($stuff=~/$custom/s) {      if ($stuff=~/$custom/s) {
    foreach my $f ('abstract','author','copyright',
          'creationdate','keywords','language',
          'lastrevisiondate','mime','notes',
          'owner','subject','title') {
       $stuff=~s/\n?\<$f[^\>]*\>.*?<\/$f[^\>]*\>\n?//;
    }
    my $m2=$m; my $docroot=$perlvar{'lonDocRoot'};
    $m2=~s/^$docroot//;
  &logthis("found: $stuff");   &logthis("found: $stuff");
    $customresult.='&custom='.escape($m2).','.escape($stuff);
     }      }
  }   }
    $result.=$customresult;
     }      }
     # reply with result      # reply with result
       $result.="\n" if $result;
             &reply("queryreply:$queryid:$result",$conserver);              &reply("queryreply:$queryid:$result",$conserver);
   
         }          }
Removed from v.1.11  
changed lines
  Added in v.1.19

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