Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.1172.2.93.4.8 and 1.1172.2.93.4.9

version 1.1172.2.93.4.8, 2018/03/28 10:22:10 version 1.1172.2.93.4.9, 2018/04/06 18:20:30
Line 11190  sub metadata { Line 11190  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 11209  sub metadata { Line 11210  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 11218  sub metadata { Line 11223  sub metadata {
 # We need to get the original file and the imported file to get the part order correct  # We need to get the original file and the imported file to get the part order correct
 # Good news: we do not need to worry about nested libraries, since parts cannot be nested  # Good news: we do not need to worry about nested libraries, since parts cannot be nested
 # Load and inspect original file if we didn't do that already  # Load and inspect original file if we didn't do that already
                            if ($#origfileimportpartids<0) {                             if ($#origfiletagids<0) {
                                undef(%importedrespids);                                 undef(%importedrespids);
                                undef(%importedpartids);                                 undef(%importedpartids);
                                if ($origfile eq '') {                                 if ($origfile eq '') {

Removed from v.1.1172.2.93.4.8  
changed lines
  Added in v.1.1172.2.93.4.9


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