--- loncom/lonnet/perl/lonnet.pm 2005/02/13 23:09:03 1.587.2.3.2.3 +++ loncom/lonnet/perl/lonnet.pm 2005/02/14 02:20:26 1.587.2.3.2.5 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.587.2.3.2.3 2005/02/13 23:09:03 albertel Exp $ +# $Id: lonnet.pm,v 1.587.2.3.2.5 2005/02/14 02:20:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1022,17 +1022,20 @@ EVALBLOCK # &logthis("load_cache_item $name took ".(&Time::HiRes::time()-$starttime)); } -sub devalidate_cache_new { - my ($name,$id) = @_; - if (1) { &Apache::lonnet::logthis("deleting $name:$id"); } - $memcache->delete(&escape($name.':'.$id)); -} - my $to_remember=10; my %remembered; my %accessed; my $kicks=0; my $hits=0; +sub devalidate_cache_new { + my ($name,$id) = @_; + if (0) { &Apache::lonnet::logthis("deleting $name:$id"); } + $id=&escape($name.':'.$id); + $memcache->delete($id); + delete($remembered{$id}); + delete($accessed{$id}); +} + sub is_cached_new { my ($name,$id,$debug) = @_; $debug=0; @@ -1067,6 +1070,7 @@ sub do_cache_new { } if ($debug) { &Apache::lonnet::logthis("Setting $id to $value"); } $memcache->set($id,$setvalue,300); + &make_room($id,$value); return $value; } @@ -4797,7 +4801,8 @@ sub gettitle { my $urlsymb=shift; my $symb=&symbread($urlsymb); if ($symb) { - my ($result,$cached)=&is_cached_new('title',$symb); + my $key=$ENV{'request.course.id'}."\0".$symb; + my ($result,$cached)=&is_cached_new('title',$key); if (defined($cached)) { return $result; } @@ -4812,7 +4817,7 @@ sub gettitle { } $title=~s/\&colon\;/\:/gs; if ($title) { - return &do_cache_new('title',$symb,$title,600); + return &do_cache_new('title',$key,$title,600); } $urlsymb=$url; }