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

Diff for /loncom/interface/lonnavmaps.pm between versions 1.323 and 1.324

version 1.323, 2005/04/11 15:33:46 version 1.324, 2005/04/15 21:08:37
Line 2122  sub generate_course_user_opt { Line 2122  sub generate_course_user_opt {
     my %courserdatas; my %useropt; my %courseopt; my %userrdatas;      my %courserdatas; my %useropt; my %courseopt; my %userrdatas;
     unless ($uhome eq 'no_host') {       unless ($uhome eq 'no_host') { 
 # ------------------------------------------------- Get coursedata (if present)  # ------------------------------------------------- Get coursedata (if present)
  unless ((time-$courserdatas{$cid.'.last_cache'})<240) {   my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
     my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.   ':resourcedata',$chome);
      ':resourcedata',$chome);   # Check for network failure
     # Check for network failure   if ( $reply =~ /no.such.host/i || $reply =~ /con_lost/i) {
     if ( $reply =~ /no.such.host/i || $reply =~ /con_lost/i) {      $self->{NETWORK_FAILURE} = 1;
  $self->{NETWORK_FAILURE} = 1;   } elsif ($reply!~/^error\:/) {
     } elsif ($reply!~/^error\:/) {      $courserdatas{$cid}=$reply;
  $courserdatas{$cid}=$reply;      $courserdatas{$cid.'.last_cache'}=time;
  $courserdatas{$cid.'.last_cache'}=time;  
     }  
  }   }
  foreach (split(/\&/,$courserdatas{$cid})) {   foreach (split(/\&/,$courserdatas{$cid})) {
     my ($name,$value)=split(/\=/,$_);      my ($name,$value)=split(/\=/,$_);
Line 2139  sub generate_course_user_opt { Line 2137  sub generate_course_user_opt {
  &Apache::lonnet::unescape($value);   &Apache::lonnet::unescape($value);
  }   }
 # --------------------------------------------------- Get userdata (if present)  # --------------------------------------------------- Get userdata (if present)
  unless ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {   my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
     my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);   if ($reply!~/^error\:/) {
     if ($reply!~/^error\:/) {      $userrdatas{$uname.'___'.$udom}=$reply;
  $userrdatas{$uname.'___'.$udom}=$reply;      $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
  $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;   }
     }   # check to see if network failed
     # check to see if network failed   elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
     elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )   {
     {      $self->{NETWORK_FAILURE} = 1;
  $self->{NETWORK_FAILURE} = 1;  
     }  
  }   }
  foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {   foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
     my ($name,$value)=split(/\=/,$_);      my ($name,$value)=split(/\=/,$_);
Removed from v.1.323  
changed lines
  Added in v.1.324

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