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

Diff for /loncom/lonsql between versions 1.18 and 1.22

version 1.18, 2001/03/27 02:09:50 version 1.22, 2001/03/27 18:34:03
Line 212  sub make_new_child { Line 212  sub make_new_child {
     my $userinput = <$client>;      my $userinput = <$client>;
     chomp($userinput);      chomp($userinput);
                   
     my ($conserver,$querytmp,$customtmp)=split(/&/,$userinput);      my ($conserver,$querytmp,
    $customtmp,$customshowtmp)=split(/&/,$userinput);
     my $query=unescape($querytmp);      my $query=unescape($querytmp);
     my $custom=unescape($customtmp);      my $custom=unescape($customtmp);
       my $customshow=unescape($customshowtmp);
   
             #send query id which is pid_unixdatetime_runningcounter              #send query id which is pid_unixdatetime_runningcounter
     $queryid = $thisserver;      $queryid = $thisserver;
Line 226  sub make_new_child { Line 228  sub make_new_child {
             #prepare and execute the query              #prepare and execute the query
     my $sth = $dbh->prepare($query);      my $sth = $dbh->prepare($query);
     my $result;      my $result;
       my @files;
     unless ($sth->execute())      unless ($sth->execute())
     {      {
  &logthis("<font color=blue>WARNING: Could not retrieve from database: $@</font>");   &logthis("<font color=blue>WARNING: Could not retrieve from database: $@</font>");
Line 233  sub make_new_child { Line 236  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 @files,@{$a}[3];
        push @r2,join(",", @b)
        } (@$r1);
  $result=join("&",@r2);   $result=join("&",@r2);
     }      }
   
     # do custom metadata searching here and build into result      # do custom metadata searching here and build into result
     if ($custom) {      if ($custom) {
  &logthis("am going to do custom query for $custom");   &logthis("am going to do custom query for $custom");
  @metalist=(); pop @metalist;   if (@files) {
  &find("$perlvar{'lonDocRoot'}/res");      @metalist=map {$perlvar{'lonDocRoot'}.$_.'meta'} @files;
    }
    else {
       @metalist=(); pop @metalist;
       &find("$perlvar{'lonDocRoot'}/res");
    }
  &logthis("FILELIST:" . join(":::",@metalist));   &logthis("FILELIST:" . join(":::",@metalist));
  # if file is indicated in sql database and   # if file is indicated in sql database and
  # not part of sql-relevant query, do not pattern match.   # not part of sql-relevant query, do not pattern match.
Line 258  sub make_new_child { Line 271  sub make_new_child {
        'creationdate','keywords','language',         'creationdate','keywords','language',
        'lastrevisiondate','mime','notes',         'lastrevisiondate','mime','notes',
        'owner','subject','title') {         'owner','subject','title') {
     $stuff=~s/\<$f[^\>]*\>.*?<\/$f[^\>]*\>//;      $stuff=~s/\n?\<$f[^\>]*\>.*?<\/$f[^\>]*\>\n?//;
  }   }
  &logthis("found: $stuff");   my $m2=$m; my $docroot=$perlvar{'lonDocRoot'};
  $customresult.='&custom='.escape($stuff);   $m2=~s/^$docroot//; $m2=~s/\.meta$//;
   # &logthis("found: $stuff");
    $customresult.='&custom='.escape($m2).','.escape($stuff);
     }      }
  }   }
  $result.=$customresult;   $result.=$customresult;
Removed from v.1.18  
changed lines
  Added in v.1.22

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