loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

version 1.357, 2005/02/26 05:37:23	version 1.358, 2005/02/28 22:17:09
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 792 sub default_homework_load {	Line 792 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) {
Line 1267 sub handler {	Line 1289 sub handler {
$Apache::lonxml::debug=$ENV{'user.debug'};	$Apache::lonxml::debug=$ENV{'user.debug'};

if ($ENV{'browser.mathml'}) {	if ($ENV{'browser.mathml'}) {
&Apache::loncommon::content_type($request,'text/xml');	#&Apache::loncommon::content_type($request,'text/xml');
	&Apache::loncommon::content_type($request,'text/html');
} else {	} else {
&Apache::loncommon::content_type($request,'text/html');	&Apache::loncommon::content_type($request,'text/html');
}	}