--- loncom/interface/lonsearchcat.pm	2001/03/21 00:32:33	1.45
+++ loncom/interface/lonsearchcat.pm	2001/03/21 01:01:43	1.46
@@ -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>
@@ -478,7 +491,7 @@ sub advancedsearch {
     }
     if (@queries) {
 	$query="(" . (join(") and ("),@queries) . ")";
-	$query="select * from metadata where $testquery";
+	$query="select * from metadata where $query";
 	my $reply=&Apache::lonnet::metadata_query($query);
 	&output_results('Advanced',$r,$envhash,$query,$reply);
     }
@@ -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>