--- loncom/lonnet/perl/lonnet.pm	2005/05/02 23:34:43	1.631
+++ loncom/lonnet/perl/lonnet.pm	2005/05/06 06:45:01	1.635
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.631 2005/05/02 23:34:43 albertel Exp $
+# $Id: lonnet.pm,v 1.635 2005/05/06 06:45:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -258,7 +258,6 @@ sub critical {
 
 sub transfer_profile_to_env {
     my ($lonidsdir,$handle)=@_;
-    undef(%env);
     my @profile;
     {
 	open(my $idf,"$lonidsdir/$handle.id");
@@ -3902,7 +3901,8 @@ sub unmark_as_readonly {
     # unmarks $file_name (if $file_name is defined), or all files locked by $what 
     # for portfolio submissions, $what contains [$symb,$crsid] 
     my ($domain,$user,$what,$file_name) = @_;
-    my $symb_crs = join('',@$what);
+    my $symb_crs = $what;
+    if (ref($what)) { $symb_crs=join('',@$what); }
     my %current_permissions = &dump('file_permissions',$domain,$user);
     my ($tmp)=keys(%current_permissions);
     if ($tmp=~/^error:/) { undef(%current_permissions); }
@@ -3913,7 +3913,9 @@ sub unmark_as_readonly {
         my @del_keys;
         if (ref($current_locks) eq "ARRAY"){
             foreach my $locker (@{$current_locks}) {
-                if ($$locker[0].$$locker[1] eq $symb_crs) {
+                my $compare=$locker;
+                if (ref($locker)) { $compare=join('',@{$locker}) };
+                if ($compare eq $symb_crs) {
                     if (defined($file_name) && ($file_name ne $file)) {
                         push(@new_locks, $what);
                     }
@@ -4143,6 +4145,12 @@ sub get_courseresdata {
     return $result;
 }
 
+sub devalidateuserresdata {
+    my ($uname,$udom)=@_;
+    my $hashid="$udom:$uname";
+    &devalidate_cache_new('userres',$hashid);
+}
+
 sub get_userresdata {
     my ($uname,$udom)=@_;
     #most student don\'t have any data set, check if there is some data
@@ -4166,7 +4174,8 @@ sub get_userresdata {
 		 $uname." at ".$udom.": ".
 		 $tmp."</font>");
     } elsif ($tmp=~/error: 2 /) {
-	&EXT_cache_set($udom,$uname);
+	#&EXT_cache_set($udom,$uname);
+	&do_cache_new('userres',$hashid,undef,600);
     }
     return $tmp;
 }
@@ -4210,7 +4219,7 @@ sub EXT_cache_status {
 sub EXT_cache_set {
     my ($target_domain,$target_user) = @_;
     my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain;
-    &appenv($cachename => time);
+    #&appenv($cachename => time);
 }
 
 # --------------------------------------------------------- Value of a Variable