--- loncom/interface/lonsearchcat.pm	2001/03/21 02:18:14	1.51
+++ loncom/interface/lonsearchcat.pm	2001/03/21 02:34:35	1.55
@@ -52,8 +52,16 @@ my %metadatafields;
 my %cprtag;
 my %mimetag;
 my $closebutton;
-my $viewselect=<<END;
-<select name='view'>
+my $basicviewselect=<<END;
+<select name='basicviewselect'>
+<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
+my $advancedviewselect=<<END;
+<select name='advancedviewselect'>
 <option value='Detailed Citation View'>Detailed Citation View</option>
 <option value='Summary View'>Summary View</option>
 <option value='Fielded Format'>Fielded Format</option>
@@ -262,7 +270,7 @@ ENDDOCUMENT
 <input type="submit" name="basicsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">
 $closebutton
-$viewselect
+$basicviewselect
 </p>
 <hr>
 <h3>Advanced Search</h3>
@@ -271,7 +279,7 @@ $scrout
 <input type="submit" name="advancedsubmit" value="SEARCH">
 <input type="reset" name="reset" value="RESET">
 $closebutton
-$viewselect
+$advancedviewselect
 </p>
 </form>
 </body>
@@ -593,7 +601,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;
@@ -617,7 +625,7 @@ sub output_results {
 	    $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"
@@ -626,18 +634,27 @@ onClick="javascript:select_data('$title'
 <br>
 END
             my $httphost=$ENV{'HTTP_HOST'};
-            if ($ENV{'form.viewselect'} eq 'Detailed Citation View') {
+
+	    my $viewselect;
+	    if ($mode eq 'Basic') {
+		$viewselect=$ENV{'form.basicviewselect'};
+	    }
+	    elsif ($mode eq 'Advanced') {
+		$viewselect=$ENV{'form.advancedviewselect'};
+	    }
+
+            if ($viewselect eq 'Detailed Citation View') {
 		$compiledresult.=&detailed_citation_view(@fields,
 							 $hostname,$httphost);
 	    }
-            elsif ($ENV{'form.viewselect'} eq 'Summary View') {
+            elsif ($viewselect eq 'Summary View') {
 		$compiledresult.=&summary_view(@fields,$hostname,$httphost);
 	    }
-            elsif ($ENV{'form.viewselect'} eq 'Fielded Format') {
+            elsif ($viewselect eq 'Fielded Format') {
 		$compiledresult.=&fielded_format_view(@fields,$hostname,
 						      $httphost);
 	    }
-            elsif ($ENV{'form.viewselect'} eq 'XML/SGML') {
+            elsif ($viewselect eq 'XML/SGML') {
 		$compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost);
 	    }
 
@@ -767,6 +784,7 @@ sub detailed_citation_view {
 	$notes,$shortabstract,$mime,$lang,
 	$creationdate,$lastrevisiondate,$owner,$copyright,
 	$hostname,$httphost)=@_;
+    return 'abc';
     my $result=<<END;
 DETAILED
 <b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A>