--- loncom/xml/run.pm	2003/03/25 03:00:31	1.33
+++ loncom/xml/run.pm	2003/11/09 01:17:35	1.42
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.33 2003/03/25 03:00:31 albertel Exp $
+# $Id: run.pm,v 1.42 2003/11/09 01:17:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,14 +47,16 @@ sub evaluate {
 	$Apache::run::timeout=1;
 	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 {
@@ -62,9 +64,14 @@ sub evaluate {
 	    $error = 'Code ran too long. It ran for more than '.
 		Apache->request->server->timeout.' seconds';
 	}
-	&Apache::lonxml::error('substitution on <pre>'.$expression.
-			       '</pre> with <pre>'.$decls.
-			       '</pre> caused <pre>'.$error);
+	&Apache::lonxml::error('substitution on <pre>'.
+			       &HTML::Entities::encode($expression).
+			       '</pre> with <pre>'.
+			       &HTML::Entities::encode($decls).
+			       '</pre> caused <pre>'.
+			       &HTML::Entities::encode($error).' '.
+			       &HTML::Entities::encode($innererror).
+			       '</pre>');
     }
     return $result
 }
@@ -78,20 +85,31 @@ sub run {
 	$Apache::run::timeout=1;
 	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::lonxml::error('<pre>'.&HTML::Entities::encode($error).
-			       '</pre> occured while running <pre>'.
-			       &HTML::Entities::encode($code).'</pre>');
+	my $errormsg='<pre>'.&HTML::Entities::encode($error).' '.
+	    &HTML::Entities::encode($innererror).
+	    '</pre> occured while running <pre>';
+	$code=&HTML::Entities::encode($code);
+	if ($innererror=~/line (\d+)/) {
+	    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') {
 	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)."<br />\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)."<br />";}
+	}
     }
-  }
-  $dump.='';
-  return $dump;
+    $dump.='';
+    return $dump;
 }
 
 1;