version 1.357, 2005/02/26 05:37:23
|
version 1.361, 2005/03/10 02:34:59
|
Line 184 sub xmlend {
|
Line 184 sub xmlend {
|
&Apache::lonxml::newparser($parser,\$discussion,''); |
&Apache::lonxml::newparser($parser,\$discussion,''); |
return ''; |
return ''; |
} else { |
} else { |
return $discussion.'</html>'; |
return $discussion.&Apache::loncommon::endbodytag(); |
} |
} |
} |
} |
|
|
Line 358 sub xmlparse {
|
Line 358 sub xmlparse {
|
|
|
my @stack = (); |
my @stack = (); |
my @parstack = (); |
my @parstack = (); |
&initdepth; |
&initdepth(); |
|
&init_alarm(); |
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars, |
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars, |
$safeeval,\%style_for_target); |
$safeeval,\%style_for_target); |
|
|
Line 368 sub xmlparse {
|
Line 368 sub xmlparse {
|
} |
} |
&do_registered_ssi(); |
&do_registered_ssi(); |
if ($Apache::lonxml::counter_changed) { &store_counter() } |
if ($Apache::lonxml::counter_changed) { &store_counter() } |
|
if ($ENV{'form.return_only_error_and_warning_counts'}) { |
|
return "$errorcount:$warningcount"; |
|
} |
return $finaloutput; |
return $finaloutput; |
} |
} |
|
|
Line 792 sub default_homework_load {
|
Line 795 sub default_homework_load {
|
} |
} |
} |
} |
|
|
|
{ |
|
my $alarm_depth; |
|
sub init_alarm { |
|
alarm(0); |
|
$alarm_depth=0; |
|
} |
|
|
|
sub start_alarm { |
|
if ($alarm_depth<1) { |
|
my $old=alarm($Apache::lonnet::perlvar{'lonScriptTimeout'}); |
|
if ($old) { |
|
&Apache::lonxml::error("Cancelled an alarm of $old, this shouldn't occur."); |
|
} |
|
} |
|
$alarm_depth++; |
|
} |
|
|
|
sub end_alarm { |
|
$alarm_depth--; |
|
if ($alarm_depth<1) { alarm(0); } |
|
} |
|
} |
my $metamode_was; |
my $metamode_was; |
sub startredirection { |
sub startredirection { |
if (!$Apache::lonxml::redirection) { |
if (!$Apache::lonxml::redirection) { |