version 1.386, 2005/11/02 22:48:52
|
version 1.389, 2005/11/15 16:38:12
|
Line 418 sub inner_xmlparse {
|
Line 418 sub inner_xmlparse {
|
my $result; |
my $result; |
my $token; |
my $token; |
my $dontpop=0; |
my $dontpop=0; |
|
my $startredirection = $Apache::lonxml::redirection; |
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') ) { |
if (($token->[0] eq 'T') || ($token->[0] eq 'C') ) { |
Line 527 sub inner_xmlparse {
|
Line 528 sub inner_xmlparse {
|
# $finaloutput.=&endredirection; |
# $finaloutput.=&endredirection; |
# } |
# } |
|
|
|
if ($target eq 'grade') { &endredirection(); } |
|
if ( $Apache::lonxml::redirection > $startredirection) { |
|
while ($Apache::lonxml::redirection > $startredirection) { |
|
$finaloutput .= &endredirection(); |
|
} |
|
} |
if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) { |
if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) { |
$finaloutput=&afterburn($finaloutput); |
$finaloutput=&afterburn($finaloutput); |
} |
} |
Line 636 sub setup_globals {
|
Line 642 sub setup_globals {
|
$Apache::lonxml::evaluate = 1; |
$Apache::lonxml::evaluate = 1; |
$Apache::lonxml::import = 1; |
$Apache::lonxml::import = 1; |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade') { |
&startredirection; |
&startredirection(); #ended in inner_xmlparse on exit |
$Apache::lonxml::metamode = 0; |
$Apache::lonxml::metamode = 0; |
$Apache::lonxml::evaluate = 1; |
$Apache::lonxml::evaluate = 1; |
$Apache::lonxml::import = 1; |
$Apache::lonxml::import = 1; |
Line 1450 sub debug {
|
Line 1456 sub debug {
|
if ($Apache::lonxml::debug eq "1") { |
if ($Apache::lonxml::debug eq "1") { |
$|=1; |
$|=1; |
my $request=$Apache::lonxml::request; |
my $request=$Apache::lonxml::request; |
if (!$request) { $request=Apache->request; } |
if (!$request) { |
|
eval { $request=Apache->request; }; |
|
} |
|
if (!$request) { |
|
eval { $request=Apache2::RequestUtil->request; }; |
|
} |
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n"); |
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n"); |
#&Apache::lonnet::logthis($_[0]); |
#&Apache::lonnet::logthis($_[0]); |
} |
} |