--- loncom/lonsql	2001/03/22 17:23:19	1.9
+++ loncom/lonsql	2001/03/26 20:43:04	1.17
@@ -234,7 +234,7 @@ 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";
+		$result=join("&",@r2);
 	    }
 
 	    # do custom metadata searching here and build into result
@@ -243,8 +243,25 @@ sub make_new_child {
 		@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.
+		# if file is indicated in sql database and is
+		# part of query result list, then do the pattern match.
+		my $customresult='';
+		foreach my $m (@metalist) {
+		    my $fh=IO::File->new($m);
+		    my @lines=<$fh>;
+		    my $stuff=join('',@lines);
+		    if ($stuff=~/$custom/s) {
+			&logthis("found: $stuff");
+		    }
+		    $customresult.='&custom='.escape($stuff);
+		}
+		$result.=$customresult;
 	    }
 	    # reply with result
+	    $result.="\n" if $result;
             &reply("queryreply:$queryid:$result",$conserver);
 
         }