--- loncom/interface/lonsearchcat.pm	2001/03/15 18:43:30	1.18
+++ loncom/interface/lonsearchcat.pm	2001/03/15 18:49:45	1.19
@@ -77,7 +77,7 @@ END
     }
 
     if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
-	return &basicsearch($r,$ENV{'form.basicexp'});
+	return &basicsearch($r,\%ENV);
     }
     elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
 	return &advancedsearch($r,\%ENV);
@@ -428,18 +428,20 @@ sub advancedsearch {
 
 # --------------------------------------------------- Performing a basic search
 sub basicsearch {
-    my ($r,$expression)=@_;
+    my ($r,$envhash)=@_;
+    my %ENV=%{$envhash};
 
-    my $query=$expression;
-    $query="select * from metadata where concat(title,\"    \",author) like '\%$expression\%'";
+    my $query=$ENV{'form.basicexp'};
+    $query="select * from metadata where concat(title,\"    \",author) like '\%$ENV{'form.basicexp'}\%'";
     my $reply=&Apache::lonnet::metadata_query($query);
-    &output_results($reply);
+    &output_results($r,$envhash,$reply);
     return OK;
 }
 
 # ----------------------------- format and output results based on a reply list
 sub output_results {
-    my (@replylist)=@_;
+    my ($r,$envhash,@replylist)=@_;
+    my %ENV=%{$envhash};
     foreach my $reply (@replylist) {
 
 	my @results;
@@ -554,7 +556,7 @@ $persistent
 <hr>
 <h3>Search Query</h3>
 <p>
-<b>Basic search:</b> $expression
+<b>Basic search:</b> $ENV{'form.basicexp'}
 </p>
 <h3>Search Results</h3>
 $compiledresult