--- loncom/lonnet/perl/lonnet.pm	2001/11/20 17:58:05	1.173
+++ loncom/lonnet/perl/lonnet.pm	2001/11/22 19:02:07	1.176
@@ -35,9 +35,9 @@
 # 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26,
 # 10/2 Gerd Kortemeyer
 # 10/5,10/10,11/13,11/15 Scott Harrison
-# 11/17 Gerd Kortemeyer
+# 11/17,11/20,11/22 Gerd Kortemeyer
 #
-# $Id: lonnet.pm,v 1.173 2001/11/20 17:58:05 harris41 Exp $
+# $Id: lonnet.pm,v 1.176 2001/11/22 19:02:07 www Exp $
 #
 ###
 
@@ -2232,7 +2232,7 @@ sub EXT {
 # ---------------------------------------------------------------- Get metadata
 
 sub metadata {
-    my ($uri,$what,$liburi,$prefix)=@_;
+    my ($uri,$what,$liburi,$prefix,$depthcount)=@_;
 
     $uri=&declutter($uri);
     my $filename=$uri;
@@ -2242,7 +2242,7 @@ sub metadata {
 # If "keys" are set, the assumption is that everything is already cached.
 # Everything is cached by the main uri, libraries are never directly cached
 #
-    unless ($metacache{$uri.':keys'}) {
+    unless (abs($metacache{$uri.':cachedtimestamp'}-time)<600) {
 #
 # Is this a recursive call for a library?
 #
@@ -2301,18 +2301,15 @@ sub metadata {
 #
 # This is not a package - some other kind of start tag
 # 
-	     my $entry=$token->[1];
-             if ($entry eq 'import') {
-#
-# Importing a library here
-#
-                my $libid=$token->[2]->{'id'};
-
-              
-             } else { 
-              my $unikey=$entry;
+              my $entry=$token->[1];
+              my $unikey;
+              if ($entry eq 'import') {
+                 $unikey='';
+              } else {
+                 $unikey=$entry;
+	      }
               if ($prefix) {
-		  $unikey.='_'.$prefix;
+		  $unikey.=$prefix;
               } else {
                 if (defined($token->[2]->{'part'})) { 
                    $unikey.='_'.$token->[2]->{'part'}; 
@@ -2321,6 +2318,22 @@ sub metadata {
               if (defined($token->[2]->{'id'})) { 
                  $unikey.='_'.$token->[2]->{'id'}; 
 	      }
+
+             if ($entry eq 'import') {
+#
+# Importing a library here
+#                
+		 if (defined($depthcount)) { $depthcount++; } else 
+                                           { $depthcount=0; }
+                 if ($depthcount<20) {
+		    $metacache{$uri.':keys'}.=','.
+		    &metadata($uri,'keys',
+                              $parser->get_text('/import'),$unikey,
+                              $depthcount);
+		 }
+
+             } else { 
+
               if (defined($token->[2]->{'name'})) { 
                  $unikey.='_'.$token->[2]->{'name'}; 
 	      }
@@ -2334,13 +2347,14 @@ sub metadata {
 			      $metacache{$uri.':'.$unikey.'.default'};
 		      }
 # end of not-a-package not-a-library import
-	     }
+	   }
 # end of not-a-package start tag
 	  }
 # the next is the end of "start tag"
 	 }
        }
        $metacache{$uri.':keys'}=join(',',keys %metathesekeys);
+       $metacache{$uri.':cachedtimestamp'}=time;
     }
     return $metacache{$uri.':'.$what};
 }