--- loncom/lonnet/perl/lonnet.pm	2007/05/02 22:01:32	1.824.2.5
+++ loncom/lonnet/perl/lonnet.pm	2007/01/16 22:08:48	1.825
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.824.2.5 2007/05/02 22:01:32 albertel Exp $
+# $Id: lonnet.pm,v 1.825 2007/01/16 22:08:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -367,26 +367,6 @@ sub transfer_profile_to_env {
     }
 }
 
-sub timed_flock {
-    my ($file,$lock_type) = @_;
-    my $failed=0;
-    eval {
-	local $SIG{__DIE__}='DEFAULT';
-	local $SIG{ALRM}=sub {
-	    $failed=1;
-	    die("failed lock");
-	};
-	alarm(13);
-	flock($file,$lock_type);
-	alarm(0);
-    };
-    if ($failed) {
-	return undef;
-    } else {
-	return 1;
-    }
-}
-
 # ---------------------------------------------------------- Append Environment
 
 sub appenv {
@@ -401,11 +381,8 @@ sub appenv {
             $env{$key}=$newenv{$key};
         }
     }
-    open(my $env_file,$env{'user.environment'});
-    if (&timed_flock($env_file,LOCK_EX)
-	&&
-	tie(my %disk_env,'GDBM_File',$env{'user.environment'},
-	    (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {
+    if (tie(my %disk_env,'GDBM_File',$env{'user.environment'},&GDBM_WRITER(),
+	    0640)) {
 	while (my ($key,$value) = each(%newenv)) {
 	    $disk_env{$key} = $value;
 	}
@@ -422,11 +399,8 @@ sub delenv {
                 "Attempt to delete from environment ".$delthis);
         return 'error';
     }
-    open(my $env_file,$env{'user.environment'});
-    if (&timed_flock($env_file,LOCK_EX)
-	&&
-	tie(my %disk_env,'GDBM_File',$env{'user.environment'},
-	    (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {
+    if (tie(my %disk_env,'GDBM_File',$env{'user.environment'},&GDBM_WRITER(),
+	    0640)) {
 	foreach my $key (keys(%disk_env)) {
 	    if ($key=~/^$delthis/) { 
                 delete($env{$key});
@@ -990,19 +964,10 @@ my %remembered;
 my %accessed;
 my $kicks=0;
 my $hits=0;
-sub make_key {
-    my ($name,$id) = @_;
-    if (length($id) > 65 
-	&& length(&escape($id)) > 200) {
-	$id=length($id).':'.&Digest::MD5::md5_hex($id);
-    }
-    return &escape($name.':'.$id);
-}
-
 sub devalidate_cache_new {
     my ($name,$id,$debug) = @_;
     if ($debug) { &Apache::lonnet::logthis("deleting $name:$id"); }
-    $id=&make_key($name,$id);
+    $id=&escape($name.':'.$id);
     $memcache->delete($id);
     delete($remembered{$id});
     delete($accessed{$id});
@@ -1010,7 +975,7 @@ sub devalidate_cache_new {
 
 sub is_cached_new {
     my ($name,$id,$debug) = @_;
-    $id=&make_key($name,$id);
+    $id=&escape($name.':'.$id);
     if (exists($remembered{$id})) {
 	if ($debug) { &Apache::lonnet::logthis("Earyl return $id of $remembered{$id} "); }
 	$accessed{$id}=[&gettimeofday()];
@@ -1033,7 +998,7 @@ sub is_cached_new {
 
 sub do_cache_new {
     my ($name,$id,$value,$time,$debug) = @_;
-    $id=&make_key($name,$id);
+    $id=&escape($name.':'.$id);
     my $setvalue=$value;
     if (!defined($setvalue)) {
 	$setvalue='__undef__';
@@ -1042,9 +1007,7 @@ sub do_cache_new {
 	$time=600;
     }
     if ($debug) { &Apache::lonnet::logthis("Setting $id to $value"); }
-    if (!($memcache->set($id,$setvalue,$time))) {
-	&logthis("caching of id -> $id  failed");
-    }
+    $memcache->set($id,$setvalue,$time);
     # need to make a copy of $value
     #&make_room($id,$value,$debug);
     return $value;
@@ -3466,16 +3429,9 @@ sub get_portfolio_access {
             }
             if (@users > 0) {
                 foreach my $userkey (@users) {
-                    if (ref($access_hash->{$userkey}{'users'}) eq 'ARRAY') {
-                        foreach my $item (@{$access_hash->{$userkey}{'users'}}) {
-                            if (ref($item) eq 'HASH') {
-                                if (($item->{'uname'} eq $env{'user.name'}) &&
-                                    ($item->{'udom'} eq $env{'user.domain'})) {
-                                    return 'ok';
-                                }
-                            }
-                        }
-                    } 
+                    if (exists($access_hash->{$userkey}{'users'}{$env{'user.name'}.':'.$env{'user.domain'}})) {
+                        return 'ok';
+                    }
                 }
             }
             my %roleshash;
@@ -7185,7 +7141,18 @@ sub repcopy_userfile {
     } else {
 	my $lwpresp = &getuploaded('GET',$uri,$cdom,$cnum,\$info,\$rtncode);
 	if ($lwpresp ne 'ok') {
-	    return -1;
+	    my $ua=new LWP::UserAgent;
+	    my $request=new HTTP::Request('GET',&tokenwrapper($uri));
+	    # FIXME, right reads everything into memory then writes it out
+	    # doing something like
+	    # 	    my $response=$ua->request($request,$file);
+	    # would make this write directly to disk
+	    my $response=$ua->request($request);
+	    if ($response->is_success()) {
+		$info=$response->content;
+	    } else {
+		return -1;
+	    }
 	}
 	my @parts = ($cdom,$cnum); 
 	if ($filename =~ m|^(.+)/[^/]+$|) {