[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /xml lonxml.pm
raeburn
raeburn@source.lon-capa.org
Fri, 27 May 2011 19:29:21 -0000
raeburn Fri May 27 19:29:21 2011 EDT
Modified files: (Branch: version_2_10_X)
/loncom/xml lonxml.pm
Log:
- Backport 1.519.
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.505.2.4 loncom/xml/lonxml.pm:1.505.2.5
--- loncom/xml/lonxml.pm:1.505.2.4 Wed Sep 29 16:12:17 2010
+++ loncom/xml/lonxml.pm Fri May 27 19:29:21 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.505.2.4 2010/09/29 16:12:17 raeburn Exp $
+# $Id: lonxml.pm,v 1.505.2.5 2011/05/27 19:29:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2141,8 +2141,8 @@
my $key;
if ($token->[1] eq 'tag') {
$tag = $token->[2]{'name'};
- $insertlist{"$tagnum.tag"} = $tag;
- $insertlist{"$tag.num"} = $tagnum;
+ $insertlist{$tagnum.'.tag'} = $tag;
+ $insertlist{$tag.'.num'} = $tagnum;
push(@alltags,$tag);
} elsif ($in_help && $token->[1] eq 'file') {
$key = $tag.'.helpfile';
@@ -2175,12 +2175,12 @@
# parse the allows and ignore tags set to <show>no</show>
foreach my $tag (@alltags) {
- next if (!exists($insertlist{"$tag.allow"}));
- my $allow = $insertlist{"$tag.allow"};
+ next if (!exists($insertlist{$tag.'.allow'}));
+ my $allow = $insertlist{$tag.'.allow'};
foreach my $element (split(',',$allow)) {
$element =~ s/(^\s*|\s*$ )//gx;
- if (!exists($insertlist{"$element.show"})
- || $insertlist{"$element.show"} ne 'no') {
+ if (!exists($insertlist{$element.'.show'})
+ || $insertlist{$element.'.show'} ne 'no') {
push(@{ $insertlist{$tag.'.which'} },$element);
}
}