--- loncom/lonnet/perl/lonnet.pm 2002/08/29 03:52:37 1.267.2.1 +++ loncom/lonnet/perl/lonnet.pm 2002/08/17 18:23:27 1.268 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.267.2.1 2002/08/29 03:52:37 albertel Exp $ +# $Id: lonnet.pm,v 1.268 2002/08/17 18:23:27 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2831,9 +2831,8 @@ sub metadata { # the next is the end of "start tag" } } - $metacache{$uri.':keys'}=join(',',keys %metathesekeys); &metadata_generate_part0(\%metathesekeys,\%metacache,$uri); - $metacache{$uri.':allpossiblekeys'}=join(',',keys %metathesekeys); + $metacache{$uri.':keys'}=join(',',keys %metathesekeys); $metacache{$uri.':cachedtimestamp'}=time; # this is the end of "was not already recently cached } @@ -3136,6 +3135,14 @@ sub declutter { return $thisfn; } +# ------------------------------------------------------------- Clutter up URLs + +sub clutter { + my $thisfn='/'.&declutter(shift); + unless ($thisfn=~/^\/(uploaded|adm)\//) { $thisfn='/res'.$thisfn; } + return $thisfn; +} + # -------------------------------------------------------- Escape Special Chars sub escape {