--- loncom/interface/lonsearchcat.pm	2001/03/21 03:06:50	1.56
+++ loncom/interface/lonsearchcat.pm	2001/03/21 03:40:39	1.59
@@ -107,7 +107,7 @@ END
     {
 	my $fh=Apache::File->new($r->dir_config('lonTabDir').'/language.tab');
 	map {
-	    $_=~/(\w+)\s+([\w\s\-]+)/;
+	    $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
 	    $language{$1}=$2;
 	} <$fh>;
     }
@@ -117,7 +117,7 @@ END
     {
 	my $fh=Apache::File->new($r->dir_config('lonIncludes').'/copyright.tab');
 	map {
-	    $_=~/(\w+)\s+([\w\s\-]+)/;
+	    $_=~/(\w+)\s+([\w\s\-]+)/; chomp;
 	    $cprtag{$1}=$2;
 	} <$fh>;
     }
@@ -127,7 +127,7 @@ END
     {
 	my $fh=Apache::File->new($r->dir_config('lonTabDir').'/filetypes.tab');
 	map {
-	    $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/;
+	    $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/; chomp;
 	    $mimetag{$1}=".$1 $3";
 	} <$fh>;
     }
@@ -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);
@@ -784,7 +795,6 @@ sub detailed_citation_view {
 	$notes,$shortabstract,$mime,$lang,
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
-    return 'abc';
     my $result=<<END;
 <i>$owner</i>, last revised $lastrevisiondate
 <h3><A HREF="http://$httphost$url" TARGET='search_preview'>$title</A></h3>
@@ -855,7 +865,7 @@ sub xml_sgml_view {
     my $result=<<END;
 <pre>
 &lt;LonCapaResource&gt;
-&lt;url&gt;http://$httphost$url&lt;/url&gt;
+&lt;url&gt;$url&lt;/url&gt;
 &lt;title&gt;$title&lt;/title&gt;
 &lt;author&gt;$author&lt;/author&gt;
 &lt;subject&gt;$subject&lt;/subject&gt;
@@ -878,6 +888,7 @@ sub xml_sgml_view {
 &lt;/copyrightInfo&gt;
 &lt;repositoryLocation&gt;$hostname&lt;/repositoryLocation&gt;
 &lt;shortabstract&gt;$shortabstract&lt;/shortabstract&gt;
+&lt;/LonCapaResource&gt;
 </pre>
 END
     return $result;