--- loncom/xml/run.pm 2003/03/24 22:43:31 1.32
+++ loncom/xml/run.pm 2004/01/29 18:46:25 1.43
@@ -1,6 +1,6 @@
package Apache::run;
#
-# $Id: run.pm,v 1.32 2003/03/24 22:43:31 albertel Exp $
+# $Id: run.pm,v 1.43 2004/01/29 18:46:25 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,26 +45,33 @@ sub evaluate {
$Apache::run::timeout=0;
$main::SIG{'ALRM'} = sub {
$Apache::run::timeout=1;
- Apache->request->print("timeout
\n");
+ die("timeout");
};
+ my $innererror;
eval {
- alarm(Apache->request->server->timeout);
+ alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
+ $innererror=$@;
alarm(0);
};
my $error=$@;
- if ($error eq '' && !$Apache::run::timeout) {
+ if ($error eq '' && $innererror eq '' && !$Apache::run::timeout) {
$result = $safeeval->reval('return $_;');
chomp $result;
} else {
if ($Apache::run::timeout) {
$error = 'Code ran too long. It ran for more than '.
- Apache->request->server->timeout.' seconds';
+ $Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
}
- &Apache::lonxml::error('substitution on
'.$expression. - 'with
'.$decls. - 'caused
'.$error); + &Apache::lonxml::error('substitution on'. + &HTML::Entities::encode($expression). + 'with'. + &HTML::Entities::encode($decls). + 'caused'. + &HTML::Entities::encode($error).' '. + &HTML::Entities::encode($innererror). + ''); } return $result } @@ -76,22 +83,33 @@ sub run { $Apache::run::timeout=0; $main::SIG{'ALRM'} = sub { $Apache::run::timeout=1; - Apache->request->print("timeout
\n"); + die("timeout"); }; + my $innererror; eval { - alarm(Apache->request->server->timeout); + alarm($Apache::lonnet::perlvar{'lonScriptTimeout'}); @result=$safeeval->reval($code); + $innererror=$@; alarm(0); }; my $error=$@; - if (($Apache::run::timeout || $error ne '') && !$hideerrors) { + if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) { if ($Apache::run::timeout) { $error = 'Code ran too long. It ran for more than '. - Apache->request->server->timeout.' seconds'; + $Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds'; } - &Apache::lonxml::error(''.&HTML::Entities::encode($error). - 'occured while running'. - &HTML::Entities::encode($code).''); + my $errormsg=''.&HTML::Entities::encode($error).' '. + &HTML::Entities::encode($innererror). + 'occured while running'; + $code=&HTML::Entities::encode($code); + if ($innererror=~/line (\d+)/) { + my $linenumber=$1; + my @code=split("\n",$code); + $code[$linenumber-1]=''. + $code[$linenumber-1].''; + $code=join("\n",@code); + } + &Apache::lonxml::error($errormsg.$code.''); } if ( $#result < '1') { return $result[0]; @@ -102,29 +120,29 @@ sub run { } sub dump { - my ($target,$safeeval)=@_; - my $dump=''; - foreach my $symname (sort keys %{$safeeval->varglob('main::')}) { - if (($symname!~/^\_/) && ($symname!~/\:$/)) { - my $line; - if ($safeeval->reval('defined($'.$symname.')')) { - $line='$'.$symname.'='.$safeeval->reval('$'.$symname); - } - if ($safeeval->reval('defined(@'.$symname.')')) { - $line='@'.$symname.'=('. - $safeeval->reval('join(",",@'.$symname.')').")"; - } - if ($safeeval->reval('defined(%'.$symname.')')) { - $line='%'.$symname.'=('; - $line.=$safeeval->reval('join(",",map { $_."=>".$'. - $symname.'{$_} } sort keys %'. - $symname.')').")" - } - if ($line ne '') { $dump.=&HTML::Entities::encode($line)."
\n"; } + my ($target,$safeeval)=@_; + my $dump=''; + foreach my $symname (sort keys %{$safeeval->varglob('main::')}) { + if (($symname!~/^\_/) && ($symname!~/\:$/)) { + my $line; + if ($safeeval->reval('defined($'.$symname.')')) { + $line='$'.$symname.'='.$safeeval->reval('$'.$symname); + } + if ($safeeval->reval('defined(@'.$symname.')')) { + $line='@'.$symname.'=('. + $safeeval->reval('join(",",@'.$symname.')').")"; + } + if ($safeeval->reval('defined(%'.$symname.')')) { + $line='%'.$symname.'=('; + $line.=$safeeval->reval('join(",",map { $_."=>".$'. + $symname.'{$_} } sort keys %'. + $symname.')').")" + } + if ($line ne '') {$dump.=&HTML::Entities::encode($line)."
";} + } } - } - $dump.=''; - return $dump; + $dump.=''; + return $dump; } 1;