version 1.50, 2005/02/26 06:10:30
|
version 1.51, 2005/02/28 22:17:09
|
Line 83 sub evaluate {
|
Line 83 sub evaluate {
|
}; |
}; |
my $innererror; |
my $innererror; |
eval { |
eval { |
alarm($Apache::lonnet::perlvar{'lonScriptTimeout'}); |
&Apache::lonxml::start_alarm(); |
$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression. |
$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression. |
"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}'); |
"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}'); |
$innererror=$@; |
$innererror=$@; |
alarm(0); |
&Apache::lonxml::end_alarm(); |
}; |
}; |
my $error=$@; |
my $error=$@; |
if ($error eq '' && $innererror eq '' && !$Apache::run::timeout) { |
if ($error eq '' && $innererror eq '' && !$Apache::run::timeout) { |
$result = $safeeval->reval('return $_;'); |
$result = $safeeval->reval('return $_;'); |
chomp $result; |
chomp $result; |
Line 121 sub run {
|
Line 121 sub run {
|
}; |
}; |
my $innererror; |
my $innererror; |
eval { |
eval { |
alarm($Apache::lonnet::perlvar{'lonScriptTimeout'}); |
&Apache::lonxml::start_alarm(); |
@result=$safeeval->reval($code); |
@result=$safeeval->reval($code); |
$innererror=$@; |
$innererror=$@; |
alarm(0); |
&Apache::lonxml::end_alarm(); |
}; |
}; |
my $error=$@; |
my $error=$@; |
if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) { |
if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) { |