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

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

version 1.324, 2005/04/15 21:08:37 version 1.325, 2005/04/15 21:28:54
Line 2114  sub generate_course_user_opt { Line 2114  sub generate_course_user_opt {
     my $udom=$env{'user.domain'};      my $udom=$env{'user.domain'};
     my $uhome=$env{'user.home'};      my $uhome=$env{'user.home'};
     my $cid=$env{'request.course.id'};      my $cid=$env{'request.course.id'};
     my $chome=$env{'course.'.$cid.'.home'};  
     my ($cdom,$cnum)=split(/\_/,$cid);      my ($cdom,$cnum)=split(/\_/,$cid);
           
     my $userprefix=$uname.'_'.$udom.'_';      my %useropt; my %courseopt;
       
     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)
  my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.   %courseopt=&Apache::lonnet::dump('resourcedata',$cdom,$cnum);
  ':resourcedata',$chome);  
  # Check for network failure   # Check for network failure
  if ( $reply =~ /no.such.host/i || $reply =~ /con_lost/i) {   my ($tmp)=keys(%courseopt);
   
    if ( $tmp =~ /no.such.host/i || $tmp =~ /con_lost/i) {
     $self->{NETWORK_FAILURE} = 1;      $self->{NETWORK_FAILURE} = 1;
  } elsif ($reply!~/^error\:/) {      undef(%courseopt);
     $courserdatas{$cid}=$reply;   } elsif ($tmp=~/^error\:/) {
     $courserdatas{$cid.'.last_cache'}=time;      undef(%courseopt);
  }  
  foreach (split(/\&/,$courserdatas{$cid})) {  
     my ($name,$value)=split(/\=/,$_);  
     $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=  
  &Apache::lonnet::unescape($value);  
  }   }
   
 # --------------------------------------------------- Get userdata (if present)  # --------------------------------------------------- Get userdata (if present)
  my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);  
  if ($reply!~/^error\:/) {   %useropt=&Apache::lonnet::dump('resourcedata',$udom,$uname);
     $userrdatas{$uname.'___'.$udom}=$reply;   ($tmp)=keys(%courseopt);
     $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;   if ($tmp=~/^error\:/) {
  }      undef(%useropt);
  # check to see if network failed   } elsif ( $tmp=~/no.such.host/i || $tmp=~/con.lost/i ) {
  elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )      # check to see if network failed
  {  
     $self->{NETWORK_FAILURE} = 1;      $self->{NETWORK_FAILURE} = 1;
  }      undef(%useropt);
  foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {  
     my ($name,$value)=split(/\=/,$_);  
     $useropt{$userprefix.&Apache::lonnet::unescape($name)}=  
  &Apache::lonnet::unescape($value);  
  }   }
  $self->{COURSE_OPT} = \%courseopt;   $self->{COURSE_OPT} = \%courseopt;
  $self->{USER_OPT} = \%useropt;   $self->{USER_OPT} = \%useropt;
Line 2187  sub generate_email_discuss_status { Line 2176  sub generate_email_discuss_status {
   
     my %feedback=();      my %feedback=();
     my %error=();      my %error=();
     my $keys = &Apache::lonnet::reply('keys:'.      my @keys = &Apache::lonnet::getkeys('nohist_email',$env{'user.domain'},
       $env{'user.domain'}.':'.   $env{'user.name'});
       $env{'user.name'}.':nohist_email',  
       $env{'user.home'});  
           
     foreach my $msgid (split(/\&/, $keys)) {      foreach my $msgid (@keys) {
  $msgid=&Apache::lonnet::unescape($msgid);  
  if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {   if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
     my $plain=      my $plain=
  &Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));   &Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
Line 2457  sub parmval_real { Line 2443  sub parmval_real {
   
     my $symbparm=$symb.'.'.$what;      my $symbparm=$symb.'.'.$what;
     my $mapparm=$mapname.'___(all).'.$what;      my $mapparm=$mapname.'___(all).'.$what;
     my $usercourseprefix=$uname.'_'.$udom.'_'.$cid;      my $usercourseprefix=$cid;
   
     my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;      my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
     my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;      my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
Removed from v.1.324  
changed lines
  Added in v.1.325

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