[BACK]Return to lonuserstate.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / rat

Diff for /rat/lonuserstate.pm between versions 1.119.2.1 and 1.120

version 1.119.2.1, 2007/10/29 18:51:00 version 1.120, 2007/08/28 01:06:15
Line 108  sub processversionfile { Line 108  sub processversionfile {
 sub loadmap {   sub loadmap { 
     my $uri=shift;      my $uri=shift;
     if ($hash{'map_pc_'.$uri}) {       if ($hash{'map_pc_'.$uri}) { 
  $errtext.=&mt('<br />Multiple use of sequence/page <tt>[_1]</tt>! The course will not function properly.',$uri);   $errtext.='<p class="LC_error">'.
       &mt('Multiple use of sequence/page [_1]! The course will not function properly.','<tt>'.$uri.'</tt>').
       '</p>';
  return;    return; 
     }      }
     $pc++;      $pc++;
Line 234  sub loadmap { Line 236  sub loadmap {
                     my $rid=$lpc.'.'.$token->[2]->{'id'};                      my $rid=$lpc.'.'.$token->[2]->{'id'};
   
                     $hash{'kind_'.$rid}='cond';                      $hash{'kind_'.$rid}='cond';
     my $condition = $token->[2]->{'value'};                      $cond[$#cond+1]=$token->[2]->{'value'};
     $condition =~ s/[\n\r]+/ /gs;   
                     push(@cond, $condition);  
                     $hash{'condid_'.$rid}=$#cond;                      $hash{'condid_'.$rid}=$#cond;
                     if ($token->[2]->{'type'}) {                      if ($token->[2]->{'type'}) {
                         $cond[$#cond].=':'.$token->[2]->{'type'};                          $cond[$#cond].=':'.$token->[2]->{'type'};
Line 350  sub simplify { Line 350  sub simplify {
 sub traceroute {  sub traceroute {
     my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_;      my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_;
     my $newsofar=$sofar=simplify($sofar);      my $newsofar=$sofar=simplify($sofar);
     unless ($beenhere=~/\&$rid\&/) {      unless ($beenhere=~/\&\Q$rid\E\&/) {
  $beenhere.=$rid.'&';     $beenhere.=$rid.'&';  
  my ($mapid,$resid)=split(/\./,$rid);   my ($mapid,$resid)=split(/\./,$rid);
  my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});   my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
Removed from v.1.119.2.1  
changed lines
  Added in v.1.120

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