--- rat/lonuserstate.pm 2006/02/28 20:56:40 1.106 +++ rat/lonuserstate.pm 2006/04/27 23:36:10 1.108 @@ -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.106 2006/02/28 20:56:40 albertel Exp $ +# $Id: lonuserstate.pm,v 1.108 2006/04/27 23:36:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -368,7 +368,11 @@ sub traceroute { } else { $hash{'conditions_'.$rid}=$sofar; } - $newsofar='_'.$rid; + + # if the expression is just the 0th condition keep it + # otherwise leave a pointer to this condition expression + $newsofar = ($sofar eq '0') ? $sofar : '_'.$rid; + if (defined($hash{'is_map_'.$rid})) { if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { $sofar=$newsofar= @@ -539,7 +543,7 @@ sub hiddenurls { sub readmap { my $short=shift; $short=~s/^\///; - my %cenv=&Apache::lonnet::coursedescription($short); + my %cenv=&Apache::lonnet::coursedescription($short,{'freshen_cache'=>1}); my $fn=$cenv{'fn'}; my $uri; $short=~s/\//\_/g;