--- loncom/interface/lonsearchcat.pm	2001/03/21 02:34:35	1.55
+++ loncom/interface/lonsearchcat.pm	2001/03/21 03:06:50	1.56
@@ -625,7 +625,7 @@ sub output_results {
 	    $shortabstract=substr($abstract,0,200) if length($abstract)>200;
 	    $fields[7]=$shortabstract;
 	    $compiledresult.=<<END;
-<p>($title)
+<p>
 END
             $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';
 <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
@@ -786,22 +786,18 @@ sub detailed_citation_view {
 	$hostname,$httphost)=@_;
     return 'abc';
     my $result=<<END;
-DETAILED
-<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
+<i>$owner</i>, last revised $lastrevisiondate
+<h3><A HREF="http://$httphost$url" TARGET='search_preview'>$title</A></h3>
+<h3>$author</h3>
+</p>
+<p>
 <b>Subject:</b> $subject<br>
 <b>Keyword(s):</b> $keywords<br>
 <b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
 <b>MIME Type:</b> $mimetag{$mime}<br>
 <b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
+<b>Copyright/Distribution:</b> $cprtag{$copyright}<br>
+$shortabstract
 </p>
 END
     return $result;
@@ -814,22 +810,10 @@ sub summary_view {
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
     my $result=<<END;
-SUMMARY
-<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
-<b>Subject:</b> $subject<br>
-<b>Keyword(s):</b> $keywords<br>
-<b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
-<b>MIME Type:</b> $mimetag{$mime}<br>
-<b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
+<a href="http://$httphost$url" TARGET='search_preview'>$author</a><br />
+$title<br />
+$owner -- $lastrevisiondate<br />
+$cprtag{$copyright}<br />
 </p>
 END
     return $result;
@@ -842,22 +826,21 @@ sub fielded_format_view {
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
     my $result=<<END;
-FIELDED
 <b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
-<b>Subject:</b> $subject<br>
-<b>Keyword(s):</b> $keywords<br>
-<b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
-<b>MIME Type:</b> $mimetag{$mime}<br>
-<b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
+<br />
+<b>Title:</b> $title<br />
+<b>Author(s):</b> $author<br />
+<b>Subject:</b> $subject<br />
+<b>Keyword(s):</b> $keywords<br />
+<b>Notes:</b> $notes<br />
+<b>MIME Type:</b> $mimetag{$mime}<br />
+<b>Language:</b> $language{$lang}<br />
+<b>Creation Date:</b> $creationdate<br />
+<b>Last Revision Date:</b> $lastrevisiondate<br />
+<b>Publisher/Owner:</b> $owner<br />
+<b>Copyright/Distribution:</b> $cprtag{$copyright}<br />
+<b>Repository Location:</b> $hostname<br />
+<b>Abstract:</b> $shortabstract<br />
 </p>
 END
     return $result;
@@ -870,23 +853,32 @@ sub xml_sgml_view {
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
     my $result=<<END;
-XML/SGML
-<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>
-<br>
-<b>Title:</b> $title<br>
-<b>Author(s):</b> $author<br>
-<b>Subject:</b> $subject<br>
-<b>Keyword(s):</b> $keywords<br>
-<b>Notes:</b> $notes<br>
-<b>Abstract:</b> $shortabstract<br>
-<b>MIME Type:</b> $mimetag{$mime}<br>
-<b>Language:</b> $language{$lang}<br>
-<b>Creation Date:</b> $creationdate<br>
-<b>Last Revision Date:</b> $lastrevisiondate<br>
-<b>Publisher/Owner:</b> $owner<br>
-<b>Copyright/Distribution:</b> $copyright<br>
-<b>Repository Location:</b> $hostname
-</p>
+<pre>
+&lt;LonCapaResource&gt;
+&lt;url&gt;http://$httphost$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;
+&lt;keywords&gt;$keywords&lt;/keywords&gt;
+&lt;notes&gt;$notes&lt;/notes&gt;
+&lt;mimeInfo&gt;
+&lt;mime&gt;$mime&lt;/mime&gt;
+&lt;mimetag&gt;$mimetag{$mime}&lt;/mimetag&gt;
+&lt;/mimeInfo&gt;
+&lt;languageInfo&gt;
+&lt;language&gt;$lang&lt;/language&gt;
+&lt;languagetag&gt;$language{$lang}&lt;/languagetag&gt;
+&lt;/languageInfo&gt;
+&lt;creationdate&gt;$creationdate&lt;/creationdate&gt;
+&lt;lastrevisiondate&gt;$lastrevisiondate&lt;/lastrevisiondate&gt;
+&lt;owner&gt;$owner&lt;/owner&gt;
+&lt;copyrightInfo&gt;
+&lt;copyright&gt;$copyright&lt;/copyright&gt;
+&lt;copyrighttag&gt;$cprtag{$copyright}&lt;/copyrighttag&gt;
+&lt;/copyrightInfo&gt;
+&lt;repositoryLocation&gt;$hostname&lt;/repositoryLocation&gt;
+&lt;shortabstract&gt;$shortabstract&lt;/shortabstract&gt;
+</pre>
 END
     return $result;
 }