--- loncom/interface/lonsearchcat.pm	2001/03/20 17:49:03	1.44
+++ loncom/interface/lonsearchcat.pm	2001/03/21 01:10:28	1.48
@@ -51,6 +51,13 @@ my $scrout;
 my %metadatafields;
 my %cprtag;
 my %mimetag;
+my $closebutton;
+my $viewselect=<<END;
+<select name='view'>
+<option value='Detailed View'>Detailed View</option>
+<option value='Brief View'>Brief View</option>
+</select>
+END
 
 sub handler {
     my $r = shift;
@@ -76,6 +83,10 @@ sub handler {
 <input type='hidden' name='catalogmode' value='interactive'>
 END
 
+    $closebutton=<<END if $ENV{'form.catalogmode'} eq 'interactive';
+<input type="button" name="close" value="CLOSE" onClick="self.close()">
+END
+
 # ------------------------------------------------ First, check out environment
     $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
 
@@ -248,7 +259,8 @@ ENDDOCUMENT
 <br>
 <input type="submit" name="basicsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">
-<input type="button" name="close" value="CLOSE" onClick="self.close()">
+$closebutton
+$viewselect
 </p>
 <hr>
 <h3>Advanced Search</h3>
@@ -256,7 +268,8 @@ $scrout
 <p>
 <input type="submit" name="advancedsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">
-<input type="button" name="close" value="CLOSE" onClick="self.close()">
+$closebutton
+$viewselect
 </p>
 </form>
 </body>
@@ -448,7 +461,7 @@ sub selectbox {
     return $selout.'</select>';
 }
 
-# ------------------------------------------------ Performing a advanced search
+# ----------------------------------------------- Performing an advanced search
 sub advancedsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
@@ -469,22 +482,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 $query";
+	my $reply=&Apache::lonnet::metadata_query($query);
+	&output_results('Advanced',$r,$envhash,$query,$reply);
+    }
+    else {
+	&output_results('Advanced',$r,$envhash,$query);
+    }
     return OK;
 }
 
@@ -549,8 +562,7 @@ BEGINNING
 $persistent
 <input type='button' value='Revise search request'
 onClick='this.form.submit();'>
-<input type='button' value='CLOSE'
-onClick='self.close();'>
+$closebutton
 <hr>
 <h3>Helpful Message</h3>
 <p>
@@ -676,8 +688,7 @@ SCRIPT
 <form method="post" action="/adm/searchcat">
 <input type='button' value='Revise search request'
 onClick='this.form.submit();'>
-<input type='button' value='CLOSE'
-onClick='self.close();'>
+$closebutton
 $persistent
 <hr>
 <h3>Search Query</h3>