--- loncom/lonnet/perl/lonnet.pm	2005/01/10 19:12:55	1.585
+++ loncom/lonnet/perl/lonnet.pm	2005/01/13 21:45:08	1.588
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.585 2005/01/10 19:12:55 albertel Exp $
+# $Id: lonnet.pm,v 1.588 2005/01/13 21:45:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1758,19 +1758,27 @@ sub get_first_access {
     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
     if ($argsymb) { $symb=$argsymb; }
     my ($map,$id,$res)=&decode_symb($symb);
-    if ($type eq 'map') { $res=$map; }
-    my %times=&get('firstaccesstimes',[$res],$udom,$uname);
-    return $times{$res};
+    if ($type eq 'map') {
+	$res=&symbread($map);
+    } else {
+	$res=$symb;
+    }
+    my %times=&get('firstaccesstimes',["$courseid\0$res"],$udom,$uname);
+    return $times{"$courseid\0$res"};
 }
 
 sub set_first_access {
     my ($type)=@_;
     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
     my ($map,$id,$res)=&decode_symb($symb);
-    if ($type eq 'map') { $res=$map; }
-    my $firstaccess=&get_first_access($type);
+    if ($type eq 'map') {
+	$res=&symbread($map);
+    } else {
+	$res=$symb;
+    }
+    my $firstaccess=&get_first_access($type,$symb);
     if (!$firstaccess) {
-	return &put('firstaccesstimes',{$res=>time},$udom,$uname);
+	return &put('firstaccesstimes',{"$courseid\0$res"=>time},$udom,$uname);
     }
     return 'already_set';
 }
@@ -2376,7 +2384,7 @@ sub privileged {
     my $now=time;
     if ($rolesdump ne '') {
         foreach (split(/&/,$rolesdump)) {
-	    if ($_!~/^rolesdef\&/) {
+	    if ($_!~/^rolesdef_/) {
 		my ($area,$role)=split(/=/,$_);
 		$area=~s/\_\w\w$//;
 		my ($trole,$tend,$tstart)=split(/_/,$role);
@@ -2408,10 +2416,17 @@ sub rolesinit {
 
     if ($rolesdump ne '') {
         foreach (split(/&/,$rolesdump)) {
-	  if ($_!~/^rolesdef\&/) {
+	  if ($_!~/^rolesdef_/) {
             my ($area,$role)=split(/=/,$_);
-            $area=~s/\_\w\w$//;
-            my ($trole,$tend,$tstart)=split(/_/,$role);
+	    $area=~s/\_\w\w$//;
+	    
+            my ($trole,$tend,$tstart);
+	    if ($role=~/^cr/) { 
+		($trole,my $trest)=($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|);
+		($tend,$tstart)=split('_',$trest);
+	    } else {
+		($trole,$tend,$tstart)=split(/_/,$role);
+	    }
             $userroles.=&set_arearole($trole,$area,$tstart,$tend,$domain,$username);
             if (($tend!=0) && ($tend<$now)) { $trole=''; }
             if (($tstart!=0) && ($tstart>$now)) { $trole=''; }