[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.304 and 1.306

version 1.304, 2002/12/04 15:23:39 version 1.306, 2002/12/05 22:59:37
Line 202  sub critical { Line 202  sub critical {
                " Critical message to unknown server ($server)</font>");                 " Critical message to unknown server ($server)</font>");
         return 'no_such_host';          return 'no_such_host';
     }      }
       sleep 2;
     my $answer=reply($cmd,$server);      my $answer=reply($cmd,$server);
     if ($answer eq 'con_lost') {      if ($answer eq 'con_lost') {
         my $pingreply=reply('ping',$server);          my $pingreply=reply('ping',$server);
Line 215  sub critical { Line 216  sub critical {
             $middlename=substr($middlename,0,16);              $middlename=substr($middlename,0,16);
             $middlename=~s/\W//g;              $middlename=~s/\W//g;
             my $dfilename=              my $dfilename=
              "$perlvar{'lonSockDir'}/delayed/$now.$middlename.$server";        "$perlvar{'lonSockDir'}/delayed/$now.$dumpcount.$$.$middlename.$server";
               $dumpcount++;
             {              {
              my $dfh;               my $dfh;
              if ($dfh=Apache::File->new(">$dfilename")) {               if ($dfh=Apache::File->new(">$dfilename")) {
Line 2718  sub courseresdata { Line 2720  sub courseresdata {
  if ($tmp !~ /^(con_lost|error|no_such_host)/i) {   if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
     $courseresdatacache{$hashid.'.time'}=time;      $courseresdatacache{$hashid.'.time'}=time;
     $courseresdatacache{$hashid}=\%dumpreply;      $courseresdatacache{$hashid}=\%dumpreply;
    } elsif ($tmp =~ /^(con_lost|no_such_host)/) {
       return $tmp;
  }   }
     }      }
     foreach my $item (@which) {      foreach my $item (@which) {
Line 2847  sub EXT { Line 2851  sub EXT {
     my %resourcedata=&get('resourcedata',      my %resourcedata=&get('resourcedata',
   [$courselevelr,$courselevelm,$courselevel],    [$courselevelr,$courselevelm,$courselevel],
  $udom,$uname);   $udom,$uname);
     if (($resourcedata{$courselevelr}!~/^error\:/) &&      my ($tmp)=keys(%resourcedata);
  ($resourcedata{$courselevelr}!~/^con_lost/)) {      &Apache::lonnet::logthis("Returned $tmp: ".join(':',keys(%resourcedata)));
       if (($tmp!~/^error\:/) && ($tmp!~/^con_lost/)) {
   
  if ($resourcedata{$courselevelr}) {   if ($resourcedata{$courselevelr}) {
     return $resourcedata{$courselevelr}; }      return $resourcedata{$courselevelr}; }
Line 2857  sub EXT { Line 2862  sub EXT {
  if ($resourcedata{$courselevel}) {   if ($resourcedata{$courselevel}) {
     return $resourcedata{$courselevel}; }      return $resourcedata{$courselevel}; }
     } else {      } else {
  if ($resourcedata{$courselevelr}!~/No such file/) {   if ($tmp!~/No such file/) {
     &logthis("<font color=blue>WARNING:".      &logthis("<font color=blue>WARNING:".
      " Trying to get resource data for ".       " Trying to get resource data for ".
      $uname." at ".$udom.": ".       $uname." at ".$udom.": ".
      $resourcedata{$courselevelr}."</font>");       $tmp."</font>");
    } elsif ($tmp =~ /^(con_lost|no_such_host)/) {
     return $tmp;
  }   }
     }      }
   
Removed from v.1.304  
changed lines
  Added in v.1.306

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