[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.173 and 1.175

version 1.173, 2001/11/20 17:58:05 version 1.175, 2001/11/20 22:40:53
Line 35 Line 35
 # 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,  # 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/2 Gerd Kortemeyer
 # 10/5,10/10,11/13,11/15 Scott Harrison  # 10/5,10/10,11/13,11/15 Scott Harrison
 # 11/17 Gerd Kortemeyer  # 11/17,11/20 Gerd Kortemeyer
 #  #
 # $Id$  # $Id$
 #  #
Line 2242  sub metadata { Line 2242  sub metadata {
 # If "keys" are set, the assumption is that everything is already cached.  # If "keys" are set, the assumption is that everything is already cached.
 # Everything is cached by the main uri, libraries are never directly 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?  # Is this a recursive call for a library?
 #  #
Line 2301  sub metadata { Line 2301  sub metadata {
 #  #
 # This is not a package - some other kind of start tag  # This is not a package - some other kind of start tag
 #   # 
      my $entry=$token->[1];                my $entry=$token->[1];
              if ($entry eq 'import') {  
 #  
 # Importing a library here  
 #  
                 my $libid=$token->[2]->{'id'};  
   
                 
              } else {   
               my $unikey=$entry;                my $unikey=$entry;
               if ($prefix) {                if ($prefix) {
   $unikey.='_'.$prefix;    $unikey.='_'.$prefix;
Line 2321  sub metadata { Line 2313  sub metadata {
               if (defined($token->[2]->{'id'})) {                 if (defined($token->[2]->{'id'})) { 
                  $unikey.='_'.$token->[2]->{'id'};                    $unikey.='_'.$token->[2]->{'id'}; 
       }        }
   
                if ($entry eq 'import') {
   #
   # Importing a library here
   #
                   my $libid=$token->[2]->{'id'};
   
                 
                } else { 
   
               if (defined($token->[2]->{'name'})) {                 if (defined($token->[2]->{'name'})) { 
                  $unikey.='_'.$token->[2]->{'name'};                    $unikey.='_'.$token->[2]->{'name'}; 
       }        }
Line 2334  sub metadata { Line 2336  sub metadata {
       $metacache{$uri.':'.$unikey.'.default'};        $metacache{$uri.':'.$unikey.'.default'};
       }        }
 # end of not-a-package not-a-library import  # end of not-a-package not-a-library import
      }     }
 # end of not-a-package start tag  # end of not-a-package start tag
   }    }
 # the next is the end of "start tag"  # the next is the end of "start tag"
  }   }
        }         }
        $metacache{$uri.':keys'}=join(',',keys %metathesekeys);         $metacache{$uri.':keys'}=join(',',keys %metathesekeys);
          $metacache{$uri.':cachedtimestamp'}=time;
     }      }
     return $metacache{$uri.':'.$what};      return $metacache{$uri.':'.$what};
 }  }
Removed from v.1.173  
changed lines
  Added in v.1.175

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>