--- loncom/xml/run.pm 2003/04/03 21:58:40 1.36 +++ loncom/xml/run.pm 2004/02/26 22:08:54 1.44 @@ -1,6 +1,6 @@ package Apache::run; # -# $Id: run.pm,v 1.36 2003/04/03 21:58:40 albertel Exp $ +# $Id: run.pm,v 1.44 2004/02/26 22:08:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,7 +31,7 @@ $Apache::run::EVALUATE_STRING=<<'ENDEVAL my %_LONCAPA_INTERNAL_oldexpressions=(); while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) { $_LONCAPA_INTERNAL_oldexpressions{$_}=1; - $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg; + $_ =~s/((?:\$|\&)(?:(?:\#\$|\#)?[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg; if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;} } ENDEVALUATE @@ -62,7 +62,7 @@ sub evaluate { } 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
'.
 			       &HTML::Entities::encode($expression).
@@ -96,12 +96,20 @@ sub run {
     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).' '.
-			       &HTML::Entities::encode($innererror).
-			       '
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]; @@ -112,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;