--- loncom/lonnet/perl/lonnet.pm 2003/06/17 01:38:14 1.380 +++ loncom/lonnet/perl/lonnet.pm 2003/06/30 18:30:42 1.383 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.380 2003/06/17 01:38:14 albertel Exp $ +# $Id: lonnet.pm,v 1.383 2003/06/30 18:30:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -982,9 +982,9 @@ sub repcopy { # ------------------------------------------------ Get server side include body sub ssi_body { - my $filelink=shift; + my ($filelink,%form)=@_; my $output=($filelink=~/^http\:/?&externalssi($filelink): - &ssi($filelink)); + &ssi($filelink,%form)); $output=~s/^.*\]*\>//si; $output=~s/\<\/body\s*\>.*$//si; $output=~ @@ -3190,12 +3190,12 @@ sub courseresdata { # sub clear_EXT_cache_status { - &delenv('cache.'); + &delenv('cache.EXT.'); } sub EXT_cache_status { my ($target_domain,$target_user) = @_; - my $cachename = 'cache.'.$target_user.'.'.$target_domain; + my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain; if (exists($ENV{$cachename}) && ($ENV{$cachename}+1800) > time) { # We know already the user has no data return 1; @@ -3206,7 +3206,7 @@ sub EXT_cache_status { sub EXT_cache_set { my ($target_domain,$target_user) = @_; - my $cachename = 'cache.'.$target_user.'.'.$target_domain; + my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain; &appenv($cachename => time); } @@ -3652,7 +3652,13 @@ sub gettitle { unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; } return &metadata($urlsymb,'title'); } - if ($titlecache{$symb}) { return $titlecache{$symb}; } + if ($titlecache{$symb}) { + if (time < ($titlecache{$symb}[1] + 600)) { + return $titlecache{$symb}[0]; + } else { + delete($titlecache{$symb}); + } + } my ($map,$resid,$url)=split(/\_\_\_/,$symb); my $title=''; my %bighash; @@ -3664,7 +3670,7 @@ sub gettitle { } $title=~s/\&colon\;/\:/gs; if ($title) { - $titlecache{$symb}=$title; + $titlecache{$symb}=[$title,time]; return $title; } else { return &metadata($urlsymb,'title');