loncom/xml/run.pm - diff

Return to run.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/run.pm between versions 1.32 and 1.40

version 1.32, 2003/03/24 22:43:31	version 1.40, 2003/10/01 21:27:35
Line 45 sub evaluate {	Line 45 sub evaluate {
$Apache::run::timeout=0;	$Apache::run::timeout=0;
$main::SIG{'ALRM'} = sub {	$main::SIG{'ALRM'} = sub {
$Apache::run::timeout=1;	$Apache::run::timeout=1;
Apache->request->print("timeout<br /> \n");	die("timeout");
};	};
	my $innererror;
eval {	eval {
alarm(Apache->request->server->timeout);	alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.	$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');	"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
	$innererror=$@;
alarm(0);	alarm(0);
};	};
my $error=$@;	my $error=$@;
if ($error eq '' && !$Apache::run::timeout) {	if ($error eq '' && $innererror eq '' && !$Apache::run::timeout) {
$result = $safeeval->reval('return $_;');	$result = $safeeval->reval('return $_;');
chomp $result;	chomp $result;
} else {	} else {
Line 62 sub evaluate {	Line 64 sub evaluate {
$error = 'Code ran too long. It ran for more than '.	$error = 'Code ran too long. It ran for more than '.
Apache->request->server->timeout.' seconds';	Apache->request->server->timeout.' seconds';
}	}
&Apache::lonxml::error('substitution on <pre>'.$expression.	&Apache::lonxml::error('substitution on <pre>'.
'</pre> with <pre>'.$decls.	&HTML::Entities::encode($expression).
'</pre> caused <pre>'.$error);	'</pre> with <pre>'.
	&HTML::Entities::encode($decls).
	'</pre> caused <pre>'.
	&HTML::Entities::encode($error).' '.
	&HTML::Entities::encode($innererror).
	'</pre>');
}	}
return $result	return $result
}	}
Line 76 sub run {	Line 83 sub run {
$Apache::run::timeout=0;	$Apache::run::timeout=0;
$main::SIG{'ALRM'} = sub {	$main::SIG{'ALRM'} = sub {
$Apache::run::timeout=1;	$Apache::run::timeout=1;
Apache->request->print("timeout<br /> \n");	die("timeout");
};	};
	my $innererror;
eval {	eval {
alarm(Apache->request->server->timeout);	alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
@result=$safeeval->reval($code);	@result=$safeeval->reval($code);
	$innererror=$@;
alarm(0);	alarm(0);
};	};
my $error=$@;	my $error=$@;
if (($Apache::run::timeout \|\| $error ne '') && !$hideerrors) {	if (($Apache::run::timeout \|\| $error ne '' \|\| $innererror ne '') && !$hideerrors) {
if ($Apache::run::timeout) {	if ($Apache::run::timeout) {
$error = 'Code ran too long. It ran for more than '.	$error = 'Code ran too long. It ran for more than '.
Apache->request->server->timeout.' seconds';	Apache->request->server->timeout.' seconds';
}	}
&Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).	my $errormsg='<pre>'.&HTML::Entities::encode($error).' '.
'</pre> occured while running <pre>'.	&HTML::Entities::encode($innererror).
&HTML::Entities::encode($code).'</pre>');	'</pre> occured while running <pre>';
	$code=&HTML::Entities::encode($code);
	&Apache::lonxml::debug("");
	if ($innererror=~/line (\d+)/) {
	&Apache::lonxml::debug("Line is $1");
	my $linenumber=$1;
	my @code=split("\n",$code);
	$code[$linenumber-1]='<b><font color="red">'.
	$code[$linenumber-1].'</font></b>';
	$code=join("\n",@code);
	}
	&Apache::lonxml::error($errormsg.$code.'</pre>');
}	}
if ( $#result < '1') {	if ( $#result < '1') {
return $result[0];	return $result[0];
Line 120 sub dump {	Line 140 sub dump {
$symname.'{$_} } sort keys %'.	$symname.'{$_} } sort keys %'.
$symname.')').")"	$symname.')').")"
}	}
if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />\n"; }	if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />"; }
}	}
}	}
$dump.='';	$dump.='';

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

Removed from v.1.32
changed lines
	Added in v.1.40