--- loncom/interface/lonsearchcat.pm	2001/11/28 16:47:25	1.105
+++ loncom/interface/lonsearchcat.pm	2001/11/29 20:33:28	1.108
@@ -1,13 +1,35 @@
 # The LearningOnline Network with CAPA
-#
 # Search Catalog
 #
+# $Id: lonsearchcat.pm,v 1.108 2001/11/29 20:33:28 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # YEAR=2001
 # 3/8, 3/12, 3/13, 3/14, 3/15, 3/19 Scott Harrison
 # 3/20, 3/21, 3/22, 3/26, 3/27, 4/2, 8/15, 8/24, 8/25 Scott Harrison
-# 10/12,10/14,10/15,10/16,11/28 Scott Harrison
+# 10/12,10/14,10/15,10/16,11/28,11/29 Scott Harrison
 #
-# $Id: lonsearchcat.pm,v 1.105 2001/11/28 16:47:25 harris41 Exp $
 ###
 
 ###############################################################################
@@ -1033,6 +1055,7 @@ ENDPOP
   BLOOP: while(1) {
       my $sn=0;
       last BLOOP unless $bloop;
+      last BLOOP unless $timeremain;
     RLOOP: foreach my $rkey (sort keys %rhash) {
 	$sn++;
 	next RLOOP if $orkey{$rkey};
@@ -1074,7 +1097,6 @@ ENDPOP
 		      $r->rflush();
 		      $tflag=0;
 		  }
-		  last WLOOP if $temp>1;
 		  if (-e "$replyfile.end") {
 		      $bloop--;
 		      $orkey{$rkey}=1;
@@ -1118,6 +1140,12 @@ ENDPOP
 		      }
 		      last WLOOP;
 		  }
+		  if ($temp>1) {
+		      sleep 1;
+		      $timeremain--;
+		      $elapsetime++;
+		      last WLOOP;
+		  }
 		  last WLOOP unless $timeremain;
 		  sleep 1;
 		  $timeremain--;