Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.1369 and 1.1371

version 1.1369, 2018/03/27 04:36:11 version 1.1371, 2018/03/30 21:30:00
Line 11928  sub metadata { Line 11928  sub metadata {
 # Check metadata for imported file to  # Check metadata for imported file to
 # see if it contained response items  # see if it contained response items
 #  #
                           my %currmetaentry = %metaentry;
                         my $libresponseorder = &metadata($location,'responseorder');                          my $libresponseorder = &metadata($location,'responseorder');
                         my $origfile;                          my $origfile;
                         if ($libresponseorder ne '') {                          if ($libresponseorder ne '') {
Line 11947  sub metadata { Line 11948  sub metadata {
                                 }                                  }
                             }                              }
                         }                          }
   # Do not overwrite contents of %metaentry hash for resource itself with 
   # hash populated for imported library file
                           %metaentry = %currmetaentry;
                           undef(%currmetaentry);
                         if ($importmode eq 'problem') {                          if ($importmode eq 'problem') {
 # Import as problem/response  # Import as problem/response
                            $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});                             $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});
Line 12123  sub metadata { Line 12128  sub metadata {
  $metaentry{':keys'} = join(',',keys(%metathesekeys));   $metaentry{':keys'} = join(',',keys(%metathesekeys));
  &metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);   &metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
  $metaentry{':allpossiblekeys'}=join(',',keys(%metathesekeys));   $metaentry{':allpossiblekeys'}=join(',',keys(%metathesekeys));
  &do_cache_new('meta',$uri,\%metaentry,$cachetime);          unless ($liburi) {
       &do_cache_new('meta',$uri,\%metaentry,$cachetime);
           }
 # this is the end of "was not already recently cached  # this is the end of "was not already recently cached
     }      }
     return $metaentry{':'.$what};      return $metaentry{':'.$what};
Line 14846  only used internally for recursive metad Line 14853  only used internally for recursive metad
 the toolsymb is only used where the uri is for an external tool (for which  the toolsymb is only used where the uri is for an external tool (for which
 the uri as well as the symb are guaranteed to be unique).  the uri as well as the symb are guaranteed to be unique).
   
 this function automatically caches all requests  this function automatically caches all requests except any made recursively
   to retrieve a list of metadata keys for an imported library file ($liburi is 
   defined).
   
 =item *  =item *
   

Removed from v.1.1369  
changed lines
  Added in v.1.1371


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