--- loncom/interface/lonsearchcat.pm	2001/03/27 12:49:18	1.81
+++ loncom/interface/lonsearchcat.pm	2001/03/27 13:35:35	1.83
@@ -560,15 +560,23 @@ sub advancedsearch {
 	$customquery=&build_custommetadata_query('custommetadata',
 				      $ENV{'form.custommetadata'});
     }
+    my $customshow='';
+    if ($ENV{'form.customshow'}) {
+	$customshow=$ENV{'form.customshow'};
+	$customshow=~s/[^\w\s]//g;
+	my @fields=split(/\s+/,$customshow);
+	$customshow=join(" ",@fields);
+    }
     if (@queries) {
 	$query=join(" AND ",@queries);
 	$query="select * from metadata where $query";
 	my $reply='';
-	unless ($customquery) {
+	unless ($customquery or $customshow) {
 	    $reply=&Apache::lonnet::metadata_query($query);
 	}
 	else {
-	    $reply=&Apache::lonnet::metadata_query($query,$customquery);
+	    $reply=&Apache::lonnet::metadata_query($query,
+						   $customquery,$customshow);
 	}
 	&output_results('Advanced',$r,$envhash,$customquery,$reply);
     }
@@ -689,11 +697,13 @@ sub output_results {
 	}
 	my $customdata='';
 	foreach my $result (@results) {
-	    $result=~/(\&custom.*)$/; # grab all custom metadata
-	    $customdata=$1;
-	    $result=~s/\&custom.*$//; # remove custom metadata
+	    if ($result=~/^(custom\=.*)$/) { # grab all custom metadata
+		$customdata.=$result;
+	    }
 	}
 	foreach my $result (@results) {
+	    next if $result=~/^custom\=/;
+	    chomp $result;
 	    my @fields=map
 	                   {&Apache::lonnet::unescape($_)}
 	                   (split(/\,/,$result));