Diff for /loncom/interface/lonsearchcat.pm between versions 1.106 and 1.108

version 1.106, 2001/11/28 19:26:20 version 1.108, 2001/11/29 20:33:28
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 #  
 # Search Catalog  # Search Catalog
 #  #
   # $Id$
   #
   # 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  # YEAR=2001
 # 3/8, 3/12, 3/13, 3/14, 3/15, 3/19 Scott Harrison  # 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  # 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$  
 ###  ###
   
 ###############################################################################  ###############################################################################
Line 1033  ENDPOP Line 1055  ENDPOP
   BLOOP: while(1) {    BLOOP: while(1) {
       my $sn=0;        my $sn=0;
       last BLOOP unless $bloop;        last BLOOP unless $bloop;
         last BLOOP unless $timeremain;
     RLOOP: foreach my $rkey (sort keys %rhash) {      RLOOP: foreach my $rkey (sort keys %rhash) {
  $sn++;   $sn++;
  next RLOOP if $orkey{$rkey};   next RLOOP if $orkey{$rkey};
Line 1074  ENDPOP Line 1097  ENDPOP
       $r->rflush();        $r->rflush();
       $tflag=0;        $tflag=0;
   }    }
   if ($temp>1) {  
       sleep 1;  
       $timeremain--;  
       $elapsetime++;  
       last WLOOP;  
   }  
   if (-e "$replyfile.end") {    if (-e "$replyfile.end") {
       $bloop--;        $bloop--;
       $orkey{$rkey}=1;        $orkey{$rkey}=1;
Line 1123  ENDPOP Line 1140  ENDPOP
       }        }
       last WLOOP;        last WLOOP;
   }    }
     if ($temp>1) {
         sleep 1;
         $timeremain--;
         $elapsetime++;
         last WLOOP;
     }
   last WLOOP unless $timeremain;    last WLOOP unless $timeremain;
   sleep 1;    sleep 1;
   $timeremain--;    $timeremain--;

Removed from v.1.106  
changed lines
  Added in v.1.108


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>