--- rat/lonuserstate.pm 2009/03/21 06:12:05 1.128.2.2 +++ rat/lonuserstate.pm 2008/11/18 19:13:37 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construct and maintain state and binary representation of course for user # -# $Id: lonuserstate.pm,v 1.128.2.2 2009/03/21 06:12:05 raeburn Exp $ +# $Id: lonuserstate.pm,v 1.129 2008/11/18 19:13:37 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -247,7 +247,7 @@ sub parse_resource { $turi=~/\.(\w+)$/; my $embstyle=&Apache::loncommon::fileembstyle($1); if ($token->[2]->{'external'} eq 'true') { # external - $turi=~s/^https?\:\/\//\/adm\/wrapper\/ext\//; + $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; } elsif ($turi=~/^\/*uploaded\//) { # uploaded if (($embstyle eq 'img') || ($embstyle eq 'emb') @@ -573,8 +573,7 @@ sub accinit { $acchash{'acc.res.'.$short.'.'}='&:0&'; my $courseuri=$uri; $courseuri=~s/^\/res\///; - my $regexp = 1; - &Apache::lonnet::delenv('(acc\.|httpref\.)',$regexp); + &Apache::lonnet::delenv('(acc\.|httpref\.)'); &Apache::lonnet::appenv(\%acchash); } @@ -878,37 +877,33 @@ of course for user. This is part of the LearningOnline Network with CAPA project described at http://www.lon-capa.org. -=head1 HANDLER SUBROUTINE +=head1 SUBROUTINES -There is no handler subroutine. +=over -=head1 OTHER SUBROUTINES +=item loadmap() -=over 4 +Loads map from disk -=item * +=item simplify() -loadmap() : Loads map from disk +Simplify expression -=item * +=item traceroute() -simplify() : Simplify expression +Build condition hash -=item * +=item accinit() -traceroute() : Build condition hash +Cascading conditions, quick access, parameters -=item * +=item readmap() -accinit() : Cascading conditions, quick access, parameters +Read map and all submaps -=item * +=item evalstate() -readmap() : Read map and all submaps - -=item * - -evalstate() : Evaluate state string +Evaluate state string =back