--- loncom/lond 2005/10/11 21:29:36 1.299 +++ loncom/lond 2006/01/27 23:05:30 1.305.2.1 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.299 2005/10/11 21:29:36 raeburn Exp $ +# $Id: lond,v 1.305.2.1 2006/01/27 23:05:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,7 +59,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.299 $'; #' stupid emacs +my $VERSION='$Revision: 1.305.2.1 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -1422,7 +1422,7 @@ sub ls_handler { open(FILE, $ulsdir.'/'.$ulsfn.".meta"); my @obsolete=; foreach my $obsolete (@obsolete) { - if($obsolete =~ m|()(on)|) { $obs = 1; } + if($obsolete =~ m/()(on|1)/) { $obs = 1; } if($obsolete =~ m|()(default)|) { $rights = 1; } } } @@ -1490,7 +1490,7 @@ sub ls2_handler { open(FILE, $ulsdir.'/'.$ulsfn.".meta"); my @obsolete=; foreach my $obsolete (@obsolete) { - if($obsolete =~ m|()(on)|) { $obs = 1; } + if($obsolete =~ m/()(on|1)/) { $obs = 1; } if($obsolete =~ m|()(default)|) { $rights = 1; } @@ -1943,6 +1943,7 @@ sub update_resource_handler { my $since=$now-$atime; if ($since>$perlvar{'lonExpire'}) { my $reply=&reply("unsub:$fname","$clientname"); + &devalidate_meta_cache($fname); unlink("$fname"); } else { my $transname="$fname.in.transfer"; @@ -1973,13 +1974,7 @@ sub update_resource_handler { alarm(0); } rename($transname,$fname); - use Cache::Memcached; - my $memcache= - new Cache::Memcached({'servers'=>['127.0.0.1:11211']}); - my $url=$fname; - $url=~s-^/home/httpd/html--; - my $id=&escape('meta:'.$url); - $memcache->delete($id); + &devalidate_meta_cache($fname); } } &Reply( $client, "ok\n", $userinput); @@ -1993,6 +1988,26 @@ sub update_resource_handler { } ®ister_handler("update", \&update_resource_handler, 0 ,1, 0); +sub devalidate_meta_cache { + my ($url) = @_; + use Cache::Memcached; + my $memcache = new Cache::Memcached({'servers'=>['127.0.0.1:11211']}); + $url = &declutter($url); + $url =~ s-\.meta$--; + my $id = &escape('meta:'.$url); + $memcache->delete($id); +} + +sub declutter { + my $thisfn=shift; + $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//; + $thisfn=~s/^\///; + $thisfn=~s|^adm/wrapper/||; + $thisfn=~s|^adm/coursedocs/showdoc/||; + $thisfn=~s/^res\///; + $thisfn=~s/\?.+$//; + return $thisfn; +} # # Fetch a user file from a remote server to the user's home directory # userfiles subdir. @@ -3586,11 +3601,7 @@ sub dump_dcmail_handler { } if (defined($sendersfilter)) { $sendersfilter=&unescape($sendersfilter); - if ($sendersfilter =~ /\&/) { - @senders = split(/\&/,$sendersfilter); - } else { - $senders[0] = $sendersfilter; - } + @senders = map { &unescape($_) } split(/\&/,$sendersfilter); } my $qresult=''; @@ -3598,11 +3609,9 @@ sub dump_dcmail_handler { if ($hashref) { while (my ($key,$value) = each(%$hashref)) { my $match = 1; - my ($timestamp,$subj,$uname,$udom) = split(/:/,&unescape($key),5); - $timestamp = &unescape($timestamp); + my ($timestamp,$subj,$uname,$udom) = + split(/:/,&unescape(&unescape($key)),5); # yes, twice really $subj = &unescape($subj); - $uname = &unescape($uname); - $udom = &unescape($udom); unless ($startfilter eq '.' || !defined($startfilter)) { if ($timestamp < $startfilter) { $match = 0; @@ -3721,11 +3730,7 @@ sub dump_domainroles_handler { } if (defined($rolesfilter)) { $rolesfilter=&unescape($rolesfilter); - if ($rolesfilter =~ /\&/) { - @roles = split(/\&/,$rolesfilter); - } else { - $roles[0] = $rolesfilter; - } + @roles = split(/\&/,$rolesfilter); } my $hashref = &tie_domain_hash($udom, "nohist_domainroles", &GDBM_WRCREAT());