--- loncom/interface/lonsearchcat.pm	2001/03/21 01:19:37	1.49
+++ loncom/interface/lonsearchcat.pm	2001/03/21 02:09:38	1.50
@@ -54,8 +54,10 @@ my %mimetag;
 my $closebutton;
 my $viewselect=<<END;
 <select name='view'>
-<option value='Detailed View'>Detailed View</option>
-<option value='Brief View'>Brief View</option>
+<option value='Detailed Citation View'>Detailed Citation View</option>
+<option value='Summary View'>Summary View</option>
+<option value='Fielded Format'>Fielded Format</option>
+<option value='XML/SGML'>XML/SGML</option>
 </select>
 END
 
@@ -605,10 +607,12 @@ sub output_results {
 	}
 
 	foreach my $result (@results) {
+	    my @fields=map
+	                   {&Apache::lonnet::unescape($_)}
+	                   (split(/\,/,$result));
 	    my ($title,$author,$subject,$url,$keywords,$version,
 		$notes,$abstract,$mime,$lang,
-		$creationdate,$lastrevisiondate,$owner,$copyright
-		)=map {&Apache::lonnet::unescape($_)} (split(/\,/,$result));
+		$creationdate,$lastrevisiondate,$owner,$copyright)=@fields;
 	    my $shortabstract=$abstract;
 	    $shortabstract=substr($abstract,0,200) if length($abstract)>200;
 	    $compiledresult.=<<END;
@@ -620,24 +624,20 @@ onClick="javascript:select_data('$title'
 </font>
 <br>
 END
-            $compiledresult.=<<END;
-<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$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>
-END
+            
+            if ($ENV{'form.viewselect'} eq 'Detailed Citation View') {
+		$compiledresult.=&detailed_citation_view(@fields);
+	    }
+            elsif ($ENV{'form.viewselect'} eq 'Summary View') {
+		$compiledresult.=&summary_view(@fields);
+	    }
+            elsif ($ENV{'form.viewselect'} eq 'Fielded Format') {
+		$compiledresult.=&fielded_format_view(@fields);
+	    }
+            elsif ($ENV{'form.viewselect'} eq 'XML/SGML') {
+		$compiledresult.=&xml_sgml_view(@fields);
+	    }
+
         }
 
 	unless ($compiledresult) {
@@ -758,5 +758,109 @@ sub recursive_SQL_query_build {
     &recursive_SQL_query_build($dkey,$pattern);
 }
 
+# ------------------------------------------------------ Detailed Citation View
+sub detailed_citation_view {
+    my ($title,$author,$subject,$url,$keywords,$version,
+	$notes,$abstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+    my $result=<<END;
+<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$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>
+END
+    return $result;
+}
+
+# ---------------------------------------------------------------- Summary View
+sub summary_view {
+    my ($title,$author,$subject,$url,$keywords,$version,
+	$notes,$abstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+    my $result=<<END;
+<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$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>
+END
+    return $result;
+}
+
+# -------------------------------------------------------------- Fielded Format
+sub fielded_format_view {
+    my ($title,$author,$subject,$url,$keywords,$version,
+	$notes,$abstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+    my $result=<<END;
+<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$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>
+END
+    return $result;
+}
+
+# -------------------------------------------------------------------- XML/SGML
+sub xml_sgml_view {
+    my ($title,$author,$subject,$url,$keywords,$version,
+	$notes,$abstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+    my $result=<<END;
+<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$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>
+END
+    return $result;
+}
+
 1;
 __END__