--- loncom/interface/lonsearchcat.pm	2001/03/20 17:49:03	1.44
+++ loncom/interface/lonsearchcat.pm	2001/03/21 00:32:33	1.45
@@ -448,7 +448,7 @@ sub selectbox {
     return $selout.'</select>';
 }
 
-# ------------------------------------------------ Performing a advanced search
+# ----------------------------------------------- Performing an advanced search
 sub advancedsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
@@ -469,22 +469,22 @@ sub advancedsearch {
 
     my $query='';
 
-    my $testquery='';
+    my @queries;
     # Go through logical expression AND/OR/NOT phrase fields.
     foreach my $field ('title','author','subject','notes','abstract') {
 	if ($ENV{'form.'.$field}) {
-	    $testquery=build_SQL_query($field,$ENV{'form.'.$field});
+	    push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
 	}
     }
-
-#    my $concatarg=join(',"    ",',
-#		       ('title', 'author', 'subject', 'notes', 'abstract'));
-
-    $query="select * from metadata where $testquery";
-
-    my $reply=&Apache::lonnet::metadata_query($query);
-
-    &output_results('Advanced',$r,$envhash,$query,$reply);
+    if (@queries) {
+	$query="(" . (join(") and ("),@queries) . ")";
+	$query="select * from metadata where $testquery";
+	my $reply=&Apache::lonnet::metadata_query($query);
+	&output_results('Advanced',$r,$envhash,$query,$reply);
+    }
+    else {
+	&output_results('Advanced',$r,$envhash,$query);
+    }
     return OK;
 }