--- loncom/interface/lonsearchcat.pm	2001/03/27 02:51:15	1.80
+++ loncom/interface/lonsearchcat.pm	2001/03/27 19:57:53	1.86
@@ -560,21 +560,33 @@ 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);
     }
-    else {
-	&output_results('Advanced',$r,$envhash,$query);
+    elsif ($customquery) {
+	my $reply='';
+	$reply=&Apache::lonnet::metadata_query('',
+					       $customquery,$customshow);
+	&output_results('Advanced',$r,$envhash,$customquery,$reply);
     }
+    $r->print('system error'); # just in case.. hrrmm..
     return OK;
 }
 
@@ -683,15 +695,20 @@ sub output_results {
 	    $customshow=~s/[^\w\s]//g;
 	    my @fields=map {"<font color=\"#008000\">$_:</font>"} 
 	                   split(/\s+/,$customshow);
-	    $extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";
+	    if ($customshow) {
+		$extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n";
+	    }
 	}
 	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;
+	    next unless $result;
 	    my @fields=map
 	                   {&Apache::lonnet::unescape($_)}
 	                   (split(/\,/,$result));