--- loncom/lonnet/perl/lonnet.pm 2005/04/07 06:56:24 1.620 +++ loncom/lonnet/perl/lonnet.pm 2005/04/15 20:46:04 1.623 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.620 2005/04/07 06:56:24 albertel Exp $ +# $Id: lonnet.pm,v 1.623 2005/04/15 20:46:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -270,7 +270,6 @@ sub transfer_profile_to_env { for ($envi=0;$envi<=$#profile;$envi++) { chomp($profile[$envi]); my ($envname,$envvalue)=split(/=/,$profile[$envi]); - $ENV{$envname} = $envvalue; $env{$envname} = $envvalue; if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) { if ($time < time-300) { @@ -278,7 +277,6 @@ sub transfer_profile_to_env { } } } - $ENV{'user.environment'} = "$lonidsdir/$handle.id"; $env{'user.environment'} = "$lonidsdir/$handle.id"; foreach my $expired_key (keys(%Remove)) { &delenv($expired_key); @@ -296,7 +294,6 @@ sub appenv { .''); delete($newenv{$_}); } else { - $ENV{$_}=$newenv{$_}; $env{$_}=$newenv{$_}; } } @@ -384,7 +381,6 @@ sub delenv { foreach (@oldenv) { if ($_=~/^$delthis/) { my ($key,undef) = split('=',$_); - delete($ENV{$key}); delete($env{$key}); } else { print $fh $_; @@ -879,6 +875,9 @@ sub do_cache_new { if (!defined($setvalue)) { $setvalue='__undef__'; } + if (!defined($time) ) { + $time=600; + } if ($debug) { &Apache::lonnet::logthis("Setting $id to $value"); } $memcache->set($id,$setvalue,$time); # need to make a copy of $value @@ -1618,7 +1617,7 @@ sub courseidput { } sub courseiddump { - my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$hostidflag,$hostidref)=@_; + my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref)=@_; my %returnhash=(); unless ($domfilter) { $domfilter=''; } foreach my $tryserver (keys %libserv) { @@ -1627,7 +1626,7 @@ sub courseiddump { foreach ( split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'. $sincefilter.':'.&escape($descfilter).':'. - &escape($instcodefilter).':'.&escape($ownerfilter), + &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter), $tryserver))) { my ($key,$value)=split(/\=/,$_); if (($key) && ($value)) { @@ -4296,7 +4295,7 @@ sub EXT { if (!defined($cached)) { my %resourcedata=&dump('resourcedata',$udom,$uname); $result=\%resourcedata; - &do_cache_new('userres',$hashid,$result); + &do_cache_new('userres',$hashid,$result,600); } my ($tmp)=keys(%$result); if (($tmp!~/^error\:/) && ($tmp!~/^con_lost/)) { @@ -4624,7 +4623,7 @@ sub metadata { $metaentry{':keys'}=join(',',keys %metathesekeys); &metadata_generate_part0(\%metathesekeys,\%metaentry,$uri); $metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys); - &do_cache_new('meta',$uri,\%metaentry); + &do_cache_new('meta',$uri,\%metaentry,60*60*24); # this is the end of "was not already recently cached } return $metaentry{':'.$what};