loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.505.2.4 and 1.505.2.7

version 1.505.2.4, 2010/09/29 16:12:17	version 1.505.2.7, 2011/12/01 04:41:55
Line 112 use Apache::lonmaxima();	Line 112 use Apache::lonmaxima();
use Apache::lonr();	use Apache::lonr();
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonhtmlcommon();	use Apache::lonhtmlcommon();
	use Apache::functionplotresponse();

#==================================== Main subroutine: xmlparse	#==================================== Main subroutine: xmlparse

Line 881 sub init_safespace {	Line 882 sub init_safespace {
$safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS');	$safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS');
$safehole->wrap(\&Apache::inputtags::finalizeawards,$safeeval,'&LONCAPA_INTERNAL_FINALIZEAWARDS');	$safehole->wrap(\&Apache::inputtags::finalizeawards,$safeeval,'&LONCAPA_INTERNAL_FINALIZEAWARDS');
$safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange');	$safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange');
	$safehole->wrap(\&Apache::functionplotresponse::fpr_val,$safeeval,'&fpr_val');
	$safehole->wrap(\&Apache::functionplotresponse::fpr_f,$safeeval,'&fpr_f');
	$safehole->wrap(\&Apache::functionplotresponse::fpr_dfdx,$safeeval,'&fpr_dfdx');
	$safehole->wrap(\&Apache::functionplotresponse::fpr_d2fdx2,$safeeval,'&fpr_d2fdx2');

# use Data::Dumper;	# use Data::Dumper;
# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');	# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');
#need to inspect this class of ops	#need to inspect this class of ops
Line 2139 sub register_insert_xml {	Line 2145 sub register_insert_xml {
while (my $token = $parser->get_token()) {	while (my $token = $parser->get_token()) {
if ($token->[0] eq 'S') {	if ($token->[0] eq 'S') {
my $key;	my $key;
if ($token->[1] eq 'tag') {	if ($token->[1] eq 'tag') {
$tag = $token->[2]{'name'};	$tag = $token->[2]{'name'};
$insertlist{"$tagnum.tag"} = $tag;	if (defined($tag)) {
$insertlist{"$tag.num"} = $tagnum;	$insertlist{$tagnum.'.tag'} = $tag;
push(@alltags,$tag);	$insertlist{$tag.'.num'} = $tagnum;
	push(@alltags,$tag);
	}
} elsif ($in_help && $token->[1] eq 'file') {	} elsif ($in_help && $token->[1] eq 'file') {
$key = $tag.'.helpfile';	$key = $tag.'.helpfile';
} elsif ($in_help && $token->[1] eq 'description') {	} elsif ($in_help && $token->[1] eq 'description') {
Line 2175 sub register_insert_xml {	Line 2183 sub register_insert_xml {

# parse the allows and ignore tags set to <show>no</show>	# parse the allows and ignore tags set to <show>no</show>
foreach my $tag (@alltags) {	foreach my $tag (@alltags) {
next if (!exists($insertlist{"$tag.allow"}));	next if (!exists($insertlist{$tag.'.allow'}));
my $allow = $insertlist{"$tag.allow"};	my $allow = $insertlist{$tag.'.allow'};
foreach my $element (split(',',$allow)) {	foreach my $element (split(',',$allow)) {
$element =~ s/(^\s\|\s$ )//gx;	$element =~ s/(^\s\|\s$ )//gx;
if (!exists($insertlist{"$element.show"})	if (!exists($insertlist{$element.'.show'})
\|\| $insertlist{"$element.show"} ne 'no') {	\|\| $insertlist{$element.'.show'} ne 'no') {
push(@{ $insertlist{$tag.'.which'} },$element);	push(@{ $insertlist{$tag.'.which'} },$element);
}	}
}	}

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

Removed from v.1.505.2.4
changed lines
	Added in v.1.505.2.7