version 1.256, 2003/05/22 20:19:18
|
version 1.257, 2003/05/22 21:05:01
|
Line 521 sub inner_xmlparse {
|
Line 521 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]; |
} 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); |
Line 544 sub inner_xmlparse {
|
Line 545 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]; |
} else { |
} else { |
$result = &callsub("end_$token->[1]", $target, $token, $stack, |
$result = &callsub("end_$token->[1]", $target, $token, $stack, |
$parstack, $pars,$safeeval, $style_for_target); |
$parstack, $pars,$safeeval, $style_for_target); |
Line 553 sub inner_xmlparse {
|
Line 555 sub inner_xmlparse {
|
} |
} |
#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 1308 sub error {
|
Line 1314 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"; |
} |
} |
} |
} |