--- loncom/interface/lonsearchcat.pm	2001/03/21 02:09:38	1.50
+++ loncom/interface/lonsearchcat.pm	2001/03/21 02:27:11	1.53
@@ -593,7 +593,7 @@ sub output_results {
 	$replyfile=$r->dir_config('lonDaemons').'/tmp/'.$1;
 	$reply=~/(.*?)\_/;
 	my $hostname=$1;
-
+	sleep 3; # temporary fix, need to check for completion and status
 	{
 	    while (1) {
 		last if -e $replyfile;
@@ -615,8 +615,9 @@ sub output_results {
 		$creationdate,$lastrevisiondate,$owner,$copyright)=@fields;
 	    my $shortabstract=$abstract;
 	    $shortabstract=substr($abstract,0,200) if length($abstract)>200;
+	    $fields[7]=$shortabstract;
 	    $compiledresult.=<<END;
-<p>
+<p>($title)
 END
             $compiledresult.=<<END if $ENV{'form.catalogmode'} eq 'interactive';
 <font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
@@ -624,18 +625,21 @@ onClick="javascript:select_data('$title'
 </font>
 <br>
 END
-            
+            my $httphost=$ENV{'HTTP_HOST'};
+
             if ($ENV{'form.viewselect'} eq 'Detailed Citation View') {
-		$compiledresult.=&detailed_citation_view(@fields);
+		$compiledresult.=&detailed_citation_view(@fields,
+							 $hostname,$httphost);
 	    }
             elsif ($ENV{'form.viewselect'} eq 'Summary View') {
-		$compiledresult.=&summary_view(@fields);
+		$compiledresult.=&summary_view(@fields,$hostname,$httphost);
 	    }
             elsif ($ENV{'form.viewselect'} eq 'Fielded Format') {
-		$compiledresult.=&fielded_format_view(@fields);
+		$compiledresult.=&fielded_format_view(@fields,$hostname,
+						      $httphost);
 	    }
             elsif ($ENV{'form.viewselect'} eq 'XML/SGML') {
-		$compiledresult.=&xml_sgml_view(@fields);
+		$compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost);
 	    }
 
         }
@@ -761,10 +765,12 @@ sub recursive_SQL_query_build {
 # ------------------------------------------------------ Detailed Citation View
 sub detailed_citation_view {
     my ($title,$author,$subject,$url,$keywords,$version,
-	$notes,$abstract,$mime,$lang,
-	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+	$notes,$shortabstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright,
+	$hostname,$httphost)=@_;
     my $result=<<END;
-<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>
+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>
@@ -787,10 +793,12 @@ END
 # ---------------------------------------------------------------- Summary View
 sub summary_view {
     my ($title,$author,$subject,$url,$keywords,$version,
-	$notes,$abstract,$mime,$lang,
-	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+	$notes,$shortabstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright,
+	$hostname,$httphost)=@_;
     my $result=<<END;
-<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>
+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>
@@ -813,10 +821,12 @@ END
 # -------------------------------------------------------------- Fielded Format
 sub fielded_format_view {
     my ($title,$author,$subject,$url,$keywords,$version,
-	$notes,$abstract,$mime,$lang,
-	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+	$notes,$shortabstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright,
+	$hostname,$httphost)=@_;
     my $result=<<END;
-<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>
+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>
@@ -839,10 +849,12 @@ END
 # -------------------------------------------------------------------- XML/SGML
 sub xml_sgml_view {
     my ($title,$author,$subject,$url,$keywords,$version,
-	$notes,$abstract,$mime,$lang,
-	$creationdate,$lastrevisiondate,$owner,$copyright)=@_;
+	$notes,$shortabstract,$mime,$lang,
+	$creationdate,$lastrevisiondate,$owner,$copyright,
+	$hostname,$httphost)=@_;
     my $result=<<END;
-<b>URL: </b> <A HREF="http://$ENV{'HTTP_HOST'}$url" TARGET='search_preview'>$url</A>
+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>