--- loncom/lonnet/perl/lonnet.pm 2005/05/03 19:22:22 1.632 +++ loncom/lonnet/perl/lonnet.pm 2005/05/25 21:33:35 1.636 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.632 2005/05/03 19:22:22 albertel Exp $ +# $Id: lonnet.pm,v 1.636 2005/05/25 21:33:35 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); } @@ -4145,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 @@ -4168,7 +4174,9 @@ sub get_userresdata { $uname." at ".$udom.": ". $tmp.""); } elsif ($tmp=~/error: 2 /) { - &EXT_cache_set($udom,$uname); + #&EXT_cache_set($udom,$uname); + &do_cache_new('userres',$hashid,undef,600); + undef($tmp); # not really an error so don't send it back } return $tmp; } @@ -4212,7 +4220,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 @@ -4643,7 +4651,6 @@ sub metadata { } my ($extension) = ($uri =~ /\.(\w+)$/); foreach my $key (sort(keys(%packagetab))) { - #&logthis("extsion1 $extension $key !!"); #no specific packages #how's our extension if ($key!~/^extension_\Q$extension\E&/) { next; } &metadata_create_package_def($uri,$key,'extension_'.$extension,