--- loncom/interface/lonsearchcat.pm	2001/03/21 03:15:46	1.57
+++ loncom/interface/lonsearchcat.pm	2001/03/21 03:40:39	1.59
@@ -494,13 +494,24 @@ sub advancedsearch {
 
     my @queries;
     # Go through logical expression AND/OR/NOT phrase fields.
-    foreach my $field ('title','author','subject','notes','abstract') {
+
+    foreach my $field ('title','author','subject','notes','abstract','url',
+		       'keywords','version','owner') {
 	if ($ENV{'form.'.$field}) {
 	    push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
 	}
     }
+    if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
+	push @queries,"(language like \"\%$ENV{'form.language'}\%\")";
+    }
+    if ($ENV{'form.mime'} and $ENV{'form.mime'} ne 'any') {
+	push @queries,"(mime like \"\%$ENV{'form.mime'}\%\")";
+    }
+    if ($ENV{'form.copyright'} and $ENV{'form.copyright'} ne 'any') {
+	push @queries,"(copyright like \"\%$ENV{'form.copyright'}\%\")";
+    }
     if (@queries) {
-	$query=join(" and ",@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);