--- loncom/lonsql	2001/03/26 20:38:12	1.16
+++ loncom/lonsql	2001/03/27 02:09:50	1.18
@@ -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
@@ -254,15 +254,21 @@ sub make_new_child {
 		    my @lines=<$fh>;
 		    my $stuff=join('',@lines);
 		    if ($stuff=~/$custom/s) {
+			foreach my $f ('abstract','author','copyright',
+				       'creationdate','keywords','language',
+				       'lastrevisiondate','mime','notes',
+				       'owner','subject','title') {
+			    $stuff=~s/\<$f[^\>]*\>.*?<\/$f[^\>]*\>//;
+			}
 			&logthis("found: $stuff");
+			$customresult.='&custom='.escape($stuff);
 		    }
-		    $customresult.='&custom='.escape($stuff);
 		}
-#		$result.=$customresult;
+		$result.=$customresult;
 	    }
 	    # reply with result
-	    $result.="ABCABC";
-            &reply("queryreply:$queryid:ABC${result}DEF",$conserver);
+	    $result.="\n" if $result;
+            &reply("queryreply:$queryid:$result",$conserver);
 
         }