--- loncom/interface/lonsearchcat.pm	2001/03/15 19:18:20	1.23
+++ loncom/interface/lonsearchcat.pm	2001/03/15 20:11:18	1.34
@@ -424,10 +424,35 @@ sub advancedsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
 
-    return(<<END);
+    my $fillflag=0;
+    for my $field ('title','author','subject','keywords','url','version',
+		   'notes','abstract','mime','language','owner',
+		   'custommetadata') {
+	if (&filled($ENV{'form.basicexp'})) {
+	    $fillflag++;
+	}
+    }
+
+    unless ($fillflag) {
+	&output_blank_field_error($r);
+	return OK;
+    }
+
+    $r->print(<<END);
 Advanced searching is not yet implemented.
 END
+    return OK;
+}
 
+# ---------------------------------------------------- see if a field is filled
+sub filled {
+    my ($field)=@_;
+    if ($field=~/\S/) {
+	return 1;
+    }
+    else {
+	return 0;
+    }
 }
 
 # --------------------------------------------------- Performing a basic search
@@ -435,12 +460,18 @@ sub basicsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
 
-    &output_blank_field_error($r) unless length($ENV{'form.basicexp'});
+    unless (&filled($ENV{'form.basicexp'})) {
+	&output_blank_field_error($r);
+	return OK;
+    }
 
     my $query=$ENV{'form.basicexp'};
-    $query="select * from metadata where concat(title,\"    \",author) like '\%$ENV{'form.basicexp'}\%'";
+    my $concatarg=join(',"    ",',
+		       ('title', 'author', 'subject', 'notes', 'abstract'));
+
+    $query="select * from metadata where concat($concatarg) like '\%$ENV{'form.basicexp'}\%'";
     my $reply=&Apache::lonnet::metadata_query($query);
-    &output_results($r,$envhash,$reply);
+    &output_results($r,$envhash,$concatarg,$reply);
     return OK;
 }
 
@@ -490,7 +521,7 @@ RESULTS
 
 # ----------------------------- format and output results based on a reply list
 sub output_results {
-    my ($r,$envhash,@replylist)=@_;
+    my ($r,$envhash,$testval,@replylist)=@_;
     my %ENV=%{$envhash};
     foreach my $reply (@replylist) {
 
@@ -597,6 +628,7 @@ SCRIPT
 <body bgcolor="#ffffff">
 <img align=right src=/adm/lonIcons/lonlogos.gif>
 <h1>Search Catalog</h1>
+$testval
 <form method="post" action="/adm/searchcat">
 <input type='button' value='Revise search request'
 onClick='this.form.submit();'>
