Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.176 and 1.178

version 1.176, 2001/11/22 19:02:07 version 1.178, 2001/11/29 18:54:16
Line 1 Line 1
 # The LearningOnline Network  # The LearningOnline Network
 # TCP networking package  # TCP networking package
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
 # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,  # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,
 # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,  # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,
 # 11/8,11/16,11/18,11/22,11/23,12/22,  # 11/8,11/16,11/18,11/22,11/23,12/22,
Line 2239  sub metadata { Line 2263  sub metadata {
     $uri=~s/\.meta$//;      $uri=~s/\.meta$//;
 #  #
 # Is the metadata already cached?  # Is the metadata already cached?
 # If "keys" are set, the assumption is that everything is already cached.  # Look at timestamp of caching
 # 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 (abs($metacache{$uri.':cachedtimestamp'}-time)<600) {      unless (abs($metacache{$uri.':cachedtimestamp'}-time)<600) {
Line 2326  sub metadata { Line 2350  sub metadata {
  if (defined($depthcount)) { $depthcount++; } else    if (defined($depthcount)) { $depthcount++; } else 
                                            { $depthcount=0; }                                             { $depthcount=0; }
                  if ($depthcount<20) {                   if ($depthcount<20) {
     $metacache{$uri.':keys'}.=','.       map {
     &metadata($uri,'keys',                           $metathesekeys{$_}=1;
                               $parser->get_text('/import'),$unikey,       } split(/\,/,&metadata($uri,'keys',
                               $depthcount);                                    $parser->get_text('/import'),$unikey,
                                     $depthcount));
  }   }
   
              } else {                } else { 
   
               if (defined($token->[2]->{'name'})) {                 if (defined($token->[2]->{'name'})) { 
Line 2355  sub metadata { Line 2379  sub metadata {
        }         }
        $metacache{$uri.':keys'}=join(',',keys %metathesekeys);         $metacache{$uri.':keys'}=join(',',keys %metathesekeys);
        $metacache{$uri.':cachedtimestamp'}=time;         $metacache{$uri.':cachedtimestamp'}=time;
   # this is the end of "was not already recently cached
     }      }
     return $metacache{$uri.':'.$what};      return $metacache{$uri.':'.$what};
 }  }

Removed from v.1.176  
changed lines
  Added in v.1.178


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