--- loncom/lonnet/perl/lonnet.pm 2000/10/07 10:09:53 1.39 +++ loncom/lonnet/perl/lonnet.pm 2000/10/11 18:15:16 1.43 @@ -36,6 +36,8 @@ # coursedescription(id) : returns and caches course description for id # repcopy(filename) : replicate file # dirlist(url) : gets a directory listing +# directcondval(index) : reading condition value of single condition from +# state string # condval(index) : value of condition index based on state # varval(name) : value of a variable # refreshstate() : refresh the state information string @@ -60,7 +62,7 @@ # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer # 10/04 Gerd Kortemeyer # 10/04 Guy Albertelli -# 10/06 Gerd Kortemeyer +# 10/06,10/09,10/10,10/11 Gerd Kortemeyer package Apache::lonnet; @@ -594,10 +596,11 @@ sub get { $ENV{'user.home'}); my @pairs=split(/\&/,$rep); my %returnhash=(); + my $i=0; map { - my ($key,$value)=split(/=/,$_); - $returnhash{unescape($key)}=unescape($value); - } @pairs; + $returnhash{$_}=unescape($pairs[$i]); + $i++; + } @storearr; return %returnhash; } @@ -655,10 +658,11 @@ sub eget { $ENV{'user.home'}); my @pairs=split(/\&/,$rep); my %returnhash=(); + my $i=0; map { - my ($key,$value)=split(/=/,$_); - $returnhash{unescape($key)}=unescape($value); - } @pairs; + $returnhash{$_}=unescape($pairs[$i]); + $i++; + } @storearr; return %returnhash; } @@ -757,7 +761,7 @@ sub allowed { # Restricted by state? if ($thisallowed=~/X/) { - if (&condval($uricond)>1) { + if (&condval($uricond)) { return '2'; } else { return ''; @@ -940,6 +944,15 @@ sub dirlist { # -------------------------------------------------------- Value of a Condition +sub directcondval { + my $number=shift; + if ($ENV{'user.state.'.$ENV{'request.course.id'}}) { + return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1); + } else { + return 2; + } +} + sub condval { my $condidx=shift; my $result=0; @@ -960,8 +973,7 @@ sub condval { } elsif (($_ eq '&') || ($_ eq '|')) { $operand=$_; } else { - my $new= - substr($ENV{'user.state.'.$ENV{'request.course.id'}},$_,1); + my $new=directcondval($_); if ($operand eq '&') { $result=$result>$new?$new:$result; } else { @@ -1089,7 +1101,7 @@ sub numval { sub rndseed { my $symb; - unless ($symb=&symbread($ENV{'request.filename'})) { return ''; } + unless ($symb=&symbread($ENV{'request.filename'})) { return time; } my $symbchck=unpack("%32C*",$symb); my $symbseed=numval($symb)%$symbchck; my $namechck=unpack("%32C*",$ENV{'user.name'});