--- loncom/lonnet/perl/lonnet.pm 2003/07/29 05:22:56 1.395 +++ loncom/lonnet/perl/lonnet.pm 2003/08/17 18:57:53 1.398.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.395 2003/07/29 05:22:56 albertel Exp $ +# $Id: lonnet.pm,v 1.398.2.1 2003/08/17 18:57:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2221,6 +2221,7 @@ sub allowed { my $orguri=$uri; $uri=&declutter($uri); + if (defined($ENV{'allowed.'.$priv})) { return $ENV{'allowed.'.$priv}; } # Free bre access to adm and meta resources if ((($uri=~/^adm\//) || ($uri=~/\.meta$/)) && ($priv eq 'bre')) { @@ -3070,7 +3071,7 @@ sub dirlist { } my $alldomstr=''; foreach (sort keys %alldom) { - $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'&domain:'; + $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'/&domain:'; } $alldomstr=~s/:$//; return split(/:/,$alldomstr); @@ -3454,7 +3455,6 @@ sub EXT { sub packages_tab_default { my ($uri,$varname)=@_; - &logthis(" $varname"); my (undef,$part,$name)=split(/\./,$varname); my $packages=&metadata($uri,'packages'); foreach my $package (split(/,/,$packages)) { @@ -3507,14 +3507,15 @@ sub metadata { if ($liburi) { $liburi=&declutter($liburi); $filename=$liburi; - } + } else { + delete($metacache{$uri.':packages'}); + } my %metathesekeys=(); unless ($filename=~/\.meta$/) { $filename.='.meta'; } my $metastring=&getfile(&filelocation('',&clutter($filename))); my $parser=HTML::LCParser->new(\$metastring); my $token; undef %metathesekeys; - delete($metacache{$uri.':packages'}); while ($token=$parser->get_token) { if ($token->[0] eq 'S') { if (defined($token->[2]->{'package'})) {