--- loncom/interface/lonsearchcat.pm	2001/08/26 21:19:35	1.98
+++ loncom/interface/lonsearchcat.pm	2001/08/26 21:49:49	1.99
@@ -998,22 +998,23 @@ RESULTS
 	$grid.="javascript:opener.displayinfo('+";
 	# "'"+'key
 	$grid.="\"'\"+'";
-	$grid.=$sk." domain=".$hostdomains{$sk};
+	$grid.=$sk;
 	my $hc;
 	if ($rhash{$sk} eq 'con_lost') {
 	    $hc="!!!BAD CONNECTION, CONTACT SYSTEM ADMINISTRATOR!!!";
 	}
 	else {
 	    $hc="'+\"'\"+\"+hc['$sk']+\"+\"'\"+'";
-	    $hcinit.="hc[\"$sk\"]=0;";
+	    $hcinit.="hc[\"$sk\"]=\"not yet connected...\";";
 	}
 	$grid.=" hitcount=".$hc;
+	$grid.=" domain=".$hostdomains{$sk};
 	$grid.=" IP=".$hostips{$sk};
 	# '+"'"+'">'+
 	$grid.="'+\"'\"+')\">'+";
 	$grid.="\n";
 	$grid.="'<img border=\"0\" name=\"img".$sn."\"".
-	    " src=\"/adm/lonIcons/srvbad.gif\" alt=\"".$sk."\" /></a>'+\n";
+	    " src=\"/adm/lonIcons/srvnull.gif\" alt=\"".$sk."\" /></a>'+\n";
 	$grid.="'<br />'+\n" unless $sn%10;
         $sn++;
     }
@@ -1028,17 +1029,13 @@ RESULTS
     popwin.document.writeln('<'+'/script>');
     popwin.document.writeln('<'+'/head>'+
         '<'+'body bgcolor="#FFFFFF">'+
-	'<'+'h3>Search Results Progress<'+'/h3>'+
-        '<'+'form name="popremain">'+
-        '<'+'br />Server space <'+'input type=text size=25 name=space value="">'+
-        '<'+'br />Status <'+'input type=text size=25 name=status value="">'+
-        '<'+'br />Maximum remaining time <'+'input type=text size=25 name=timeout '+
-	'value="30">'+
-        '<'+'tt>'+
 	'<'+'image align="right" src="/adm/lonIcons/'+
 	'lonanim.gif" '+
 	'alt="animated logo" />'+
-	'<'+'br /><i>PLEASE BE PATIENT</i>'+
+	'<'+'h3>Search Results Progress<'+'/h3>'+
+        '<'+'form name="popremain">'+
+        '<'+'tt>'+
+	'<'+'br clear="all"/><i>PLEASE BE PATIENT</i>'+
 	'<'+'br />SCANNING $servernum SERVERS'+
 	'<'+'br clear="all" />Number of record hits found '+
 	'<'+'input type="text" size="10" name="numhits"'+
@@ -1068,9 +1065,6 @@ RESULTS
 ENDPOP
     $r->rflush();
 
-    $r->print('<script>popwin.document.popremain.space.value="'.
-	      $servernum.', 0%, count=0/'.$servernum.'";</script>');
-    $r->rflush(); 
     my $servercount=0;
     $sn=0;
     my $hitcountsum=0;
@@ -1080,19 +1074,16 @@ ENDPOP
 	$tflag=1;
 	$compiledresult='';
 	my $hostname=$rkey;
-	$r->print('<script>popwin.document.popremain.status.value="'.
-		  $rkey.', trying contact";</script>'."\n");
-	$r->rflush();
 	my $reply=$rhash{$rkey};
 	my @results;
 	
 	my $replyfile='';
 
 	if ($reply eq 'con_lost') {
-	    my $percent=sprintf('%3.0f',($servercount/$servernum*100));
-	    $r->print('<script>popwin.document.popremain.space.value="'.
-		      $servernum.', '.$percent.'%, count='.$servercount.
-		      '/'.$servernum.'";</script>');
+	    $r->print('<script>popwin.document.img'.$sn.'.'.
+		      'src="/adm/lonIcons/srvbad.gif";</script>'.
+		      "\n");
+	    $r->rflush();
 	}
 	else {
 	    $reply=~/^([\.\w]+)$/; # must do since 'use strict' checks for tainting
@@ -1102,12 +1093,12 @@ ENDPOP
 		my $temp=0;
 	      WLOOP: while (1) {
 		  if (-e $replyfile && $tflag) {
-		      $r->print('<script>popwin.document.popremain.status.'.
-				'value="'.$rkey.', transmitting";</script>'.
+		      $r->print('<script>popwin.document.img'.$sn.'.'.
+				'src="/adm/lonIcons/srvhalf.gif";</script>'.
 				"\n");
 		      $r->rflush();
-		      $r->print('<script>popwin.document.img'.$sn.'.'.
-				'src="/adm/lonIcons/srvempty.gif";</script>'.
+		      $r->print('<script>popwin.hc["'.$rkey.'"]='.
+				'"still transferring..."'.';</script>'.
 				"\n");
 		      $r->rflush();
 		      $tflag=0;
@@ -1136,15 +1127,22 @@ ENDPOP
 				    "\n");
 			  $r->rflush();
 		      }
+		      else {
+			  $r->print('<script>popwin.document.img'.$sn.'.'.
+				'src="/adm/lonIcons/srvempty.gif";</script>'.
+				"\n");
+			  $r->rflush();
+			  $r->print('<script>popwin.hc["'.$rkey.'"]=0'.
+				    ';</script>'.
+				    "\n");
+			  $r->rflush();
+		      }
 		      last WLOOP;
 		  }
 		  last WLOOP unless $timeremain;
 		  sleep 1;
 		  $timeremain--;
 		  $elapsetime++;
-		  $r->print('<script>popwin.document.popremain.timeout.'.
-			    'value="'.$timeremain.'";</script>'."\n");
-		  $r->rflush();
 		  $r->print('<script>popwin.document.popremain.elapsetime.'.
 			    'value="'.$elapsetime.'";</script>'."\n");
 		  $r->rflush();
@@ -1258,9 +1256,6 @@ END
 $compiledresult
 RESULTS
         my $percent=sprintf('%3.0f',($servercount/$servernum*100));
-	$r->print('<script>popwin.document.popremain.space.value="'.
-	          $servernum.', '.$percent.'%, count='.$servercount.
-		  '/'.$servernum.'";</script>'."\n");
     }
     unless ($resultflag) {
         $r->print("\nThere were no results that matched your query\n");