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.256 and 1.260

version 1.256, 2003/05/22 20:19:18	version 1.260, 2003/05/29 18:42:22
Line 151 $Apache::lonxml::counter_changed=0;	Line 151 $Apache::lonxml::counter_changed=0;
#internal check on whether to look at style defs	#internal check on whether to look at style defs
$Apache::lonxml::usestyle=1;	$Apache::lonxml::usestyle=1;

	#locations used to store the parameter string for style substitutions
	$Apache::lonxml::style_values='';
	$Apache::lonxml::style_end_values='';

sub xmlbegin {	sub xmlbegin {
my $output='';	my $output='';
if ($ENV{'browser.mathml'}) {	if ($ENV{'browser.mathml'}) {
Line 494 sub inner_xmlparse {	Line 498 sub inner_xmlparse {
my $finaloutput = '';	my $finaloutput = '';
my $result;	my $result;
my $token;	my $token;
	my $dontpop=0;
while ( $#$pars > -1 ) {	while ( $#$pars > -1 ) {
while ($token = $$pars['-1']->get_token) {	while ($token = $$pars['-1']->get_token) {
if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') \|\| ($token->[0] eq 'D') ) {	if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') \|\| ($token->[0] eq 'D') ) {
Line 521 sub inner_xmlparse {	Line 526 sub inner_xmlparse {
my $string=$$style_for_target{$token->[1]}.	my $string=$$style_for_target{$token->[1]}.
'<LONCAPA_INTERNAL_TURN_STYLE_ON />';	'<LONCAPA_INTERNAL_TURN_STYLE_ON />';
&Apache::lonxml::newparser($pars,\$string);	&Apache::lonxml::newparser($pars,\$string);
	$Apache::lonxml::style_values=$$parstack[-1];
	$Apache::lonxml::style_end_values=$$parstack[-1];
} else {	} else {
$result = &callsub("start_$token->[1]", $target, $token, $stack,	$result = &callsub("start_$token->[1]", $target, $token, $stack,
$parstack, $pars, $safeeval, $style_for_target);	$parstack, $pars, $safeeval, $style_for_target);
}	}
} elsif ($token->[0] eq 'E') {	} elsif ($token->[0] eq 'E') {
#clear out any tags that didn't end
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
my $lasttag=$$stack[-1];
if ($token->[1] =~ /^$lasttag$/i) {
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>');
last;
} else {
&Apache::lonxml::warning('Found tag </'.$token->[1].'> on line '.$token->[3].' when looking for </'.$$stack[-1].'> in file');
&end_tag($stack,$parstack,$token);
}
}

if ($Apache::lonxml::usestyle &&	if ($Apache::lonxml::usestyle &&
exists($$style_for_target{'/'."$token->[1]"})) {	exists($$style_for_target{'/'."$token->[1]"})) {
$Apache::lonxml::usestyle=0;	$Apache::lonxml::usestyle=0;
my $string=$$style_for_target{'/'.$token->[1]}.	my $string=$$style_for_target{'/'.$token->[1]}.
'<LONCAPA_INTERNAL_TURN_STYLE_ON />';	'<LONCAPA_INTERNAL_TURN_STYLE_ON end="'.$token->[1].'" />';
&Apache::lonxml::newparser($pars,\$string);	&Apache::lonxml::newparser($pars,\$string);
	$Apache::lonxml::style_values=$Apache::lonxml::style_end_values;
	$Apache::lonxml::style_end_values='';
	$dontpop=1;
} else {	} else {
$result = &callsub("end_$token->[1]", $target, $token, $stack,	#clear out any tags that didn't end
$parstack, $pars,$safeeval, $style_for_target);	while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
	my $lasttag=$$stack[-1];
	if ($token->[1] =~ /^$lasttag$/i) {
	&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>');
	last;
	} else {
	&Apache::lonxml::warning('Found tag </'.$token->[1].'> on line '.$token->[3].' when looking for </'.$$stack[-1].'> in file');
	&end_tag($stack,$parstack,$token);
	}
	}
	$result = &callsub("end_$token->[1]", $target, $token, $stack,
	$parstack, $pars,$safeeval, $style_for_target);
}	}
} else {	} else {
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");	&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
}	}
#evaluate variable refs in result	#evaluate variable refs in result
if ($result ne "") {	if ($result ne "") {
	my $extras;
	if (!$Apache::lonxml::usestyle) {
	$extras=$Apache::lonxml::style_values;
	}
if ( $#$parstack > -1 ) {	if ( $#$parstack > -1 ) {
$result=&Apache::run::evaluate($result,$safeeval,$$parstack[-1]);	$result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
} else {	} else {
$result= &Apache::run::evaluate($result,$safeeval,'');	$result= &Apache::run::evaluate($result,$safeeval,$extras);
}	}
}	}
if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') \|\| ($token->[0] eq 'D') ) {	if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') \|\| ($token->[0] eq 'D') ) {
Line 577 sub inner_xmlparse {	Line 590 sub inner_xmlparse {
}	}
$result = '';	$result = '';

if ($token->[0] eq 'E') {	if ($token->[0] eq 'E' && !$dontpop) {
&end_tag($stack,$parstack,$token);	&end_tag($stack,$parstack,$token);
}	}
	$dontpop=0;
}	}
if ($#$pars > -1) {	if ($#$pars > -1) {
pop @$pars;	pop @$pars;
Line 1017 sub newparser {	Line 1031 sub newparser {
} else {	} else {
push (@Apache::lonxml::pwd, $dir);	push (@Apache::lonxml::pwd, $dir);
}	}
# &Apache::lonxml::debug("pwd:$#Apache::lonxml::pwd");
# &Apache::lonxml::debug("pwd:$Apache::lonxml::pwd[$#Apache::lonxml::pwd]");
}	}

sub parstring {	sub parstring {
Line 1186 sub handler {	Line 1198 sub handler {

my $target=&get_target();	my $target=&get_target();

$Apache::lonxml::debug=0;	$Apache::lonxml::debug=$ENV{'user.debug'};

if ($ENV{'browser.mathml'}) {	if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');	$request->content_type('text/xml');
Line 1308 sub error {	Line 1320 sub error {

sub warning {	sub warning {
$warningcount++;	$warningcount++;
if ($ENV{'request.state'} eq 'construct') {	if ($ENV{'request.state'} eq 'construct' \|\| $Apache::lonxml::debug) {
print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";	print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
}	}
}	}

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

Removed from v.1.256
changed lines
	Added in v.1.260