--- rat/lonuserstate.pm	2000/08/22 15:26:28	1.4
+++ rat/lonuserstate.pm	2000/08/23 13:02:58	1.5
@@ -10,7 +10,7 @@
 # 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 Gerd Kortemeyer
+# 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -245,7 +245,7 @@ sub accinit {
     my %acchash=();
     my %captured=();
     my $condcounter=0;
-    $acchash{'acc.cond.0'}='0';
+    $acchash{'acc.cond.'.$short.'.0'}=0;
     map {
        if ($_=~/^conditions/) {
 	  my $expr=$hash{$_};
@@ -265,7 +265,7 @@ sub accinit {
           unless (defined($captured{$expr})) {
 	      $condcounter++;
               $captured{$expr}=$condcounter;
-              $acchash{'acc.cond.'.$condcounter}=$expr;
+              $acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr;
           } 
         }
     } keys %hash;
@@ -282,10 +282,10 @@ sub accinit {
             } else {
                 $urifile.=':0';
             }
-            if (defined($acchash{'acc.res.'.$uripath})) {
-		$acchash{'acc.res.'.$uripath}.=$urifile.'&';
+            if (defined($acchash{'acc.res.'.$short.'.'.$uripath})) {
+		$acchash{'acc.res.'.$short.'.'.$uripath}.=$urifile.'&';
             } else {
-                $acchash{'acc.res.'.$uripath}='&'.$urifile.'&';
+                $acchash{'acc.res.'.$short.'.'.$uripath}='&'.$urifile.'&';
             }
         }
     } keys %hash;