--- rat/lonuserstate.pm	2007/12/01 03:43:49	1.127
+++ rat/lonuserstate.pm	2009/02/18 07:06:19	1.131
@@ -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.127 2007/12/01 03:43:49 albertel Exp $
+# $Id: lonuserstate.pm,v 1.131 2009/02/18 07:06:19 raeburn 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/^http\:\/\//\/adm\/wrapper\/ext\//;
+	    $turi=~s/^https?\:\/\//\/adm\/wrapper\/ext\//;
 	} elsif ($turi=~/^\/*uploaded\//) { # uploaded
 	    if (($embstyle eq 'img') 
 		|| ($embstyle eq 'emb')
@@ -573,8 +573,9 @@ sub accinit {
     $acchash{'acc.res.'.$short.'.'}='&:0&';
     my $courseuri=$uri;
     $courseuri=~s/^\/res\///;
-    &Apache::lonnet::delenv('(acc\.|httpref\.)');
-    &Apache::lonnet::appenv(%acchash);
+    my $regexp = 1;
+    &Apache::lonnet::delenv('(acc\.|httpref\.)',$regexp);
+    &Apache::lonnet::appenv(\%acchash);
 }
 
 # ---------------- Selectively delete from randompick maps and hidden url parms
@@ -630,7 +631,7 @@ sub hiddenurls {
     }
 # --------------------------------------- append randomout entry to environment
     if ($randomoutentry) {
-	&Apache::lonnet::appenv('acc.randomout' => $randomoutentry);
+	&Apache::lonnet::appenv({'acc.randomout' => $randomoutentry});
     }
 }
 
@@ -678,9 +679,9 @@ sub readmap {
 	$hash{'is_map_0.0'}=1;
 	loadmap($uri,'0.0');
 	if (defined($hash{'map_start_'.$uri})) {
-	    &Apache::lonnet::appenv("request.course.id"  => $short,
-				    "request.course.fn"  => $fn,
-				    "request.course.uri" => $uri);
+	    &Apache::lonnet::appenv({"request.course.id"  => $short,
+				     "request.course.fn"  => $fn,
+				     "request.course.uri" => $uri});
 	    $env{'request.course.id'}=$short;
 	    &traceroute('0',$hash{'map_start_'.$uri},'&');
 	    &accinit($uri,$short,$fn);
@@ -751,9 +752,9 @@ sub readmap {
 		(tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640))) {
 		if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_READER(),0640)) {
 		    $retfurl='/adm/navmaps';
-		    &Apache::lonnet::appenv("request.course.id"  => $short,
-					    "request.course.fn"  => $fn,
-					    "request.course.uri" => $uri);
+		    &Apache::lonnet::appenv({"request.course.id"  => $short,
+					     "request.course.fn"  => $fn,
+					     "request.course.uri" => $uri});
 		    untie(%hash);
 		    untie(%parmhash);
 		    last;
@@ -814,7 +815,7 @@ sub evalstate {
 	    }
 	}
     }
-    &Apache::lonnet::appenv('user.state.'.$env{'request.course.id'} => $state);
+    &Apache::lonnet::appenv({'user.state.'.$env{'request.course.id'} => $state});
     return $state;
 }
 
@@ -877,37 +878,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