--- loncom/lonnet/perl/lonnet.pm 2001/11/20 22:30:20 1.174 +++ loncom/lonnet/perl/lonnet.pm 2001/11/20 22:40:53 1.175 @@ -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 Gerd Kortemeyer # -# $Id: lonnet.pm,v 1.174 2001/11/20 22:30:20 www Exp $ +# $Id: lonnet.pm,v 1.175 2001/11/20 22:40:53 www Exp $ # ### @@ -2301,15 +2301,7 @@ 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 $entry=$token->[1]; my $unikey=$entry; if ($prefix) { $unikey.='_'.$prefix; @@ -2321,6 +2313,16 @@ sub metadata { if (defined($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'})) { $unikey.='_'.$token->[2]->{'name'}; } @@ -2334,7 +2336,7 @@ 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"