--- loncom/lonnet/perl/lonnet.pm 2001/08/07 09:47:53 1.140 +++ loncom/lonnet/perl/lonnet.pm 2001/08/08 17:56:57 1.144 @@ -122,7 +122,7 @@ # 5/30 H. K. Ng # 6/1 Gerd Kortemeyer # July Guy Albertelli -# 8/4,8/7 Gerd Kortemeyer +# 8/4,8/7,8/8 Gerd Kortemeyer package Apache::lonnet; @@ -1823,6 +1823,12 @@ sub EXT { $metadata=&metadata($ENV{'request.filename'}, 'parameter_'.$spacequalifierrest); if ($metadata) { return $metadata; } + + $spacequalifierrest=~/[^\_]+$/; + + $metadata=&metadata($ENV{'request.filename'},'parameter_0'.$1); + + if ($metadata) { return $metadata; } # ---------------------------------------------------- Any other user namespace } elsif ($realm eq 'environment') { @@ -1872,14 +1878,18 @@ sub metadata { if ($_=~/^$package\&/) { my ($pack,$name,$subp)=split(/\&/,$_); my $value=$packagetab{$_}; + my $part=$keyroot; + $part=~s/^\_//; if ($subp eq 'display') { - my $part=$keyroot; - $part=~s/^\_//; $value.=' [Part: '.$part.']'; } my $unikey='parameter'.$keyroot.'_'.$name; $metathesekeys{$unikey}=1; - $metacache{$uri.':'.$unikey.'.'.$subp}=$value; + $metacache{$uri.':'.$unikey.'.part'}=$part; + unless + (defined($metacache{$uri.':'.$unikey.'.'.$subp})) { + $metacache{$uri.':'.$unikey.'.'.$subp}=$value; + } } } keys %packagetab; } else { @@ -2194,7 +2204,11 @@ if ($readit ne 'done') { while (my $configline=<$config>) { chomp($configline); my ($short,$plain)=split(/:/,$configline); - if ($plain ne '') { $packagetab{$short}=$plain; } + my ($pack,$name)=split(/\&/,$short); + if ($plain ne '') { + $packagetab{$pack.'&'.$name.'&name'}=$name; + $packagetab{$short}=$plain; + } } }