--- loncom/interface/lonsearchcat.pm	2001/03/15 19:23:10	1.25
+++ loncom/interface/lonsearchcat.pm	2001/03/15 21:38:52	1.38
@@ -424,24 +424,49 @@ sub advancedsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
 
-    $r->print(<<END);
-Advanced searching is not yet implemented.
-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;
+    }
+    &output_results($r,$envhash,$reply);
     return OK;
 }
 
+# ---------------------------------------------------- see if a field is filled
+sub filled {
+    my ($field)=@_;
+    if ($field=~/\S/) {
+	return 1;
+    }
+    else {
+	return 0;
+    }
+}
+
 # --------------------------------------------------- Performing a basic search
 sub basicsearch {
     my ($r,$envhash)=@_;
     my %ENV=%{$envhash};
 
-    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);
     return OK;