--- loncom/interface/lonsearchcat.pm 2001/11/28 19:26:20 1.106 +++ loncom/interface/lonsearchcat.pm 2001/11/28 19:30:32 1.107 @@ -7,7 +7,7 @@ # 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 # -# $Id: lonsearchcat.pm,v 1.106 2001/11/28 19:26:20 harris41 Exp $ +# $Id: lonsearchcat.pm,v 1.107 2001/11/28 19:30:32 harris41 Exp $ ### ############################################################################### @@ -1033,6 +1033,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,12 +1075,6 @@ ENDPOP $r->rflush(); $tflag=0; } - if ($temp>1) { - sleep 1; - $timeremain--; - $elapsetime++; - last WLOOP; - } if (-e "$replyfile.end") { $bloop--; $orkey{$rkey}=1; @@ -1123,6 +1118,12 @@ ENDPOP } last WLOOP; } + if ($temp>1) { + sleep 1; + $timeremain--; + $elapsetime++; + last WLOOP; + } last WLOOP unless $timeremain; sleep 1; $timeremain--;