--- rat/lonuserstate.pm 2009/11/16 20:26:04 1.128.2.3 +++ rat/lonuserstate.pm 2009/11/15 21:31:23 1.133 @@ -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.3 2009/11/16 20:26:04 raeburn Exp $ +# $Id: lonuserstate.pm,v 1.133 2009/11/15 21:31:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -688,9 +688,9 @@ sub readmap { 'Could not untie coursemap hash '.$fn.' for '.$uri.'.'); } } - flock(LOCKFILE,LOCK_UN); + flock(LOCKFILE,LOCK_UN); } - unless ($lock && $tiedhash && $tiedparmhash) { + unless ($lock && $tiedhash && $tiedparmhash) { # if we are here it is likely because we are already trying to # initialize the course in another child, busy wait trying to # tie the hashes for the next 90 seconds, if we succeed forward @@ -703,7 +703,7 @@ sub readmap { } if ($tiedhash) { unless($untiedhash) { - untie(%hash); + untie(%hash); } } if ($tiedparmhash) { @@ -711,8 +711,8 @@ sub readmap { untie(%parmhash); } } - &Apache::lonnet::logthis('WARNING: '. - "Could not tie coursemap $fn for $uri."); + &Apache::lonnet::logthis('WARNING: '. + "Could not tie coursemap $fn for $uri."); $tiedhash = ''; $tiedparmhash = ''; my $i=0; @@ -728,18 +728,18 @@ sub readmap { if (-e "$fn.state") { $retfurl='/adm/navmaps'; &Apache::lonnet::appenv({"request.course.id" => $short, - "request.course.fn" => $fn, + "request.course.fn" => $fn, "request.course.uri" => $uri}); - $untiedhash = untie(%hash); - $untiedparmhash = untie(%parmhash); + $untiedhash = untie(%hash); + $untiedparmhash = untie(%parmhash); $gotstate = 1; last; - } + } $untiedparmhash = untie(%parmhash); - } - $untiedhash = untie(%hash); - } - } + } + $untiedhash = untie(%hash); + } + } } if ($lock) { flock(LOCKFILE,LOCK_UN); @@ -1002,37 +1002,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 - -There is no handler subroutine. - -=head1 OTHER SUBROUTINES +=head1 SUBROUTINES -=over 4 +=over -=item * +=item loadmap() -loadmap() : Loads map from disk +Loads map from disk -=item * +=item simplify() -simplify() : Simplify expression +Simplify expression -=item * +=item traceroute() -traceroute() : Build condition hash +Build condition hash -=item * +=item accinit() -accinit() : Cascading conditions, quick access, parameters +Cascading conditions, quick access, parameters -=item * +=item readmap() -readmap() : Read map and all submaps +Read map and all submaps -=item * +=item evalstate() -evalstate() : Evaluate state string +Evaluate state string =back