--- loncom/lonnet/perl/lonnet.pm	2001/07/27 20:17:14	1.134
+++ loncom/lonnet/perl/lonnet.pm	2001/08/07 22:56:06	1.143
@@ -121,7 +121,8 @@
 # 5/26,5/28 Gerd Kortemeyer
 # 5/30 H. K. Ng
 # 6/1 Gerd Kortemeyer
-#
+# July Guy Albertelli
+# 8/4,8/7 Gerd Kortemeyer
 
 package Apache::lonnet;
 
@@ -130,7 +131,7 @@ use Apache::File;
 use LWP::UserAgent();
 use HTTP::Headers;
 use vars 
-qw(%perlvar %hostname %homecache %spareid %hostdom %libserv %pr %prp %fe %fd $readit %metacache);
+qw(%perlvar %hostname %homecache %spareid %hostdom %libserv %pr %prp %fe %fd $readit %metacache %packagetab);
 use IO::Socket;
 use GDBM_File;
 use Apache::Constants qw(:common :http);
@@ -895,7 +896,7 @@ sub rolesinit {
         my $author=0;
         map {
             %thesepriv=();
-            if ($_!~/^st/) { $adv=1; }
+            if (($_!~/^st/) && ($_!~/^ta/)) { $adv=1; }
             if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
             map {
                 if ($_ ne '') {
@@ -1822,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') {
@@ -1845,25 +1852,58 @@ sub metadata {
     my $filename=$uri;
     $uri=~s/\.meta$//;
     unless ($metacache{$uri.':keys'}) {
+        my %metathesekeys=();
         unless ($filename=~/\.meta$/) { $filename.='.meta'; }
 	my $metastring=&getfile($perlvar{'lonDocRoot'}.'/res/'.$filename);
         my $parser=HTML::TokeParser->new(\$metastring);
         my $token;
+        undef %metathesekeys;
         while ($token=$parser->get_token) {
            if ($token->[0] eq 'S') {
+	     if (defined($token->[2]->{'package'})) {
+	      my $package=$token->[2]->{'package'};
+	      my $keyroot='';
+              if (defined($token->[2]->{'part'})) { 
+                 $keyroot.='_'.$token->[2]->{'part'}; 
+	      }
+              if (defined($token->[2]->{'id'})) { 
+                 $keyroot.='_'.$token->[2]->{'id'}; 
+	      }
+              if ($metacache{$uri.':packages'}) {
+                 $metacache{$uri.':packages'}.=','.$package.$keyroot;
+              } else {
+                 $metacache{$uri.':packages'}=$package.$keyroot;
+	      }
+              map {
+		  if ($_=~/^$package\&/) {
+		      my ($pack,$name,$subp)=split(/\&/,$_);
+                      my $value=$packagetab{$_};
+                      if ($subp eq 'display') {
+			  my $part=$keyroot;
+                          $part=~s/^\_//;
+			  $value.=' [Part: '.$part.']';
+                      }
+                      my $unikey='parameter'.$keyroot.'_'.$name;
+                      $metathesekeys{$unikey}=1;
+                      unless 
+                       (defined($metacache{$uri.':'.$unikey.'.'.$subp})) {
+                         $metacache{$uri.':'.$unikey.'.'.$subp}=$value;
+		      }
+                  }
+              } keys %packagetab;
+             } else {
 	      my $entry=$token->[1];
               my $unikey=$entry;
               if (defined($token->[2]->{'part'})) { 
                  $unikey.='_'.$token->[2]->{'part'}; 
 	      }
+              if (defined($token->[2]->{'id'})) { 
+                 $unikey.='_'.$token->[2]->{'id'}; 
+	      }
               if (defined($token->[2]->{'name'})) { 
                  $unikey.='_'.$token->[2]->{'name'}; 
 	      }
-              if ($metacache{$uri.':keys'}) {
-                 $metacache{$uri.':keys'}.=','.$unikey;
-              } else {
-                 $metacache{$uri.':keys'}=$unikey;
-	      }
+              $metathesekeys{$unikey}=1;
               map {
 		  $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
               } @{$token->[3]};
@@ -1872,8 +1912,10 @@ sub metadata {
 		      ) { $metacache{$uri.':'.$unikey}=
 			      $metacache{$uri.':'.$unikey.'.default'};
 		      }
-          }
+	    }
+	 }
        }
+       $metacache{$uri.':keys'}=join(',',keys %metathesekeys);
     }
     return $metacache{$uri.':'.$what};
 }
@@ -2154,6 +2196,21 @@ if ($readit ne 'done') {
     }
 }
 
+# ---------------------------------------------------------- Read package table
+{
+    my $config=Apache::File->new("$perlvar{'lonTabDir'}/packages.tab");
+
+    while (my $configline=<$config>) {
+       chomp($configline);
+       my ($short,$plain)=split(/:/,$configline);
+       my ($pack,$name)=split(/\&/,$short);
+       if ($plain ne '') {
+          $packagetab{$pack.'&'.$name.'&name'}=$name; 
+          $packagetab{$short}=$plain; 
+       }
+    }
+}
+
 # ------------------------------------------------------------- Read file types
 {
     my $config=Apache::File->new("$perlvar{'lonTabDir'}/filetypes.tab");