--- loncom/lonsql	2001/03/26 20:28:34	1.14
+++ loncom/lonsql	2001/03/27 13:35:35	1.21
@@ -212,9 +212,11 @@ sub make_new_child {
 	    my $userinput = <$client>;
 	    chomp($userinput);
 	    	    
-	    my ($conserver,$querytmp,$customtmp)=split(/&/,$userinput);
+	    my ($conserver,$querytmp,
+		$customtmp,$customshowtmp)=split(/&/,$userinput);
 	    my $query=unescape($querytmp);
 	    my $custom=unescape($customtmp);
+	    my $customshow=unescape($customshowtmp);
 
             #send query id which is pid_unixdatetime_runningcounter
 	    $queryid = $thisserver;
@@ -226,6 +228,7 @@ sub make_new_child {
             #prepare and execute the query
 	    my $sth = $dbh->prepare($query);
 	    my $result;
+	    my @files;
 	    unless ($sth->execute())
 	    {
 		&logthis("<font color=blue>WARNING: Could not retrieve from database: $@</font>");
@@ -233,16 +236,26 @@ sub make_new_child {
 	    }
 	    else {
 		my $r1=$sth->fetchall_arrayref;
-		my @r2; map {my $a=$_; my @b=map {escape($_)} @$a; push @r2,join(",", @b)} (@$r1);
-		$result=join("&",@r2) . "\n";
+		my @r2;
+		map {my $a=$_; 
+		     my @b=map {escape($_)} @$a;
+		     push @files,@{$a}[3];
+		     push @r2,join(",", @b)
+		     } (@$r1);
+		$result=join("&",@r2);
 	    }
 
 	    # do custom metadata searching here and build into result
 	    if ($custom) {
 		&logthis("am going to do custom query for $custom");
-		@metalist=(); pop @metalist;
-		&find("$perlvar{'lonDocRoot'}/res");
-		&logthis("FILELIST:" . join(":::",@metalist));
+		if (@files) {
+		    @metalist=map {$perlvar{'lonDocRoot'}.$_.'meta'} @files;
+		}
+		else {
+		    @metalist=(); pop @metalist;
+		    &find("$perlvar{'lonDocRoot'}/res");
+		}
+#		&logthis("FILELIST:" . join(":::",@metalist));
 		# if file is indicated in sql database and
 		# not part of sql-relevant query, do not pattern match.
 		# if file is not in sql database, output error.
@@ -254,14 +267,22 @@ sub make_new_child {
 		    my @lines=<$fh>;
 		    my $stuff=join('',@lines);
 		    if ($stuff=~/$custom/s) {
-			&logthis("found: $stuff");
+			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//; $m2=~s/\.meta$//;
+#			&logthis("found: $stuff");
+			$customresult.='&custom='.escape($m2).','.escape($stuff);
 		    }
-		    $customresult.='&custom='.escape($stuff);
 		}
-#		$result.=$customresult;
+		$result.=$customresult;
 	    }
 	    # reply with result
-	    $result="ABCABC";
+	    $result.="\n" if $result;
             &reply("queryreply:$queryid:$result",$conserver);
 
         }