--- rat/lonuserstate.pm	2000/09/04 17:17:51	1.8
+++ rat/lonuserstate.pm	2000/09/30 17:26:28	1.9
@@ -10,7 +10,8 @@
 # 7/1 Gerd Kortemeyer)
 # 7/1,7/3,7/4,7/7,7/8,7/10 Gerd Kortemeyer)
 #
-# 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23,8/30,9/2,9/4 Gerd Kortemeyer
+# 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23,8/30,
+# 9/2,9/4,9/29,9/30 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -291,20 +292,25 @@ sub accinit {
     my $courseuri=$uri;
     $courseuri=~s/^\/res\///;
     &Apache::lonnet::appenv(%acchash,
-                            "request.course"     => $short,
+                            "request.course.id"  => $short,
                             "request.course.fn"  => $fn,
                             "request.course.uri" => $courseuri); 
 }
 
 # ---------------------------------------------------- Read map and all submaps
 
-#
-# Call with uri of course map, short name for course, and filename for
-# binary structure
-#
-
 sub readmap {
-   my ($uri,$short,$fn)=@_;
+   my $short=shift;
+   $short=~s/^\///;
+   my %cenv=&Apache::lonnet::coursedescription($short);
+   my $fn=$cenv{'fn'};
+   my $uri;
+   $short=~s/\//\_/g;
+   unless ($uri=$cenv{'url'}) { 
+      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
+                       "Could not load course $short.</font>"); 
+      return 'No course data available.';
+   }
    @cond=('true:normal');
    if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) {
     %hash=();