--- loncom/xml/run.pm	2002/06/24 21:23:26	1.31
+++ loncom/xml/run.pm	2003/10/01 21:34:53	1.41
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.31 2002/06/24 21:23:26 albertel Exp $
+# $Id: run.pm,v 1.41 2003/10/01 21:34:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,51 +37,86 @@ $Apache::run::EVALUATE_STRING=<<'ENDEVAL
 ENDEVALUATE
 
 sub evaluate {
-  my ($expression,$safeeval,$decls) = @_;
-  unless (defined($expression)) { return ''; }
-  if ($Apache::lonxml::evaluate < 1) { return $expression; }
-  my $result = '';
-  $@='';
-  if ($Apache::lonxml::request) {
-    $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
-  }
-  $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
-		   "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
-  if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
-#  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
-  my $error=$@;
-  if ($@ eq '') {
-    $result = $safeeval->reval('return $_;');
-    chomp $result;
-  } else {
-    &Apache::lonxml::error('substitution on <pre>'.$expression.
-			   '</pre> with <pre>'.$decls.
-			   '</pre> caused <pre>'.$error);
-  }  
-  return $result
+    my ($expression,$safeeval,$decls) = @_;
+    unless (defined($expression)) { return ''; }
+    if ($Apache::lonxml::evaluate < 1) { return $expression; }
+    my $result = '';
+    $@='';
+    $Apache::run::timeout=0;
+    $main::SIG{'ALRM'} = sub {
+	$Apache::run::timeout=1;
+	die("timeout");
+    };
+    my $innererror;
+    eval {
+	alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
+	$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
+			 "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
+	$innererror=$@;
+	alarm(0);
+    };
+    my $error=$@;
+    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::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
 }
 
 sub run {
-  my ($code,$safeeval,$hideerrors) = @_;
-#  print "inside run\n";
-  $@='';
-  if ($Apache::lonxml::request) {
-    $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
-  }
-  my (@result)=$safeeval->reval($code);
-  if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
-  my $error=$@;
-  if ($error ne '' && !$hideerrors) {
-    &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).
-			   '</pre> occured while running <pre>'.
-			   &HTML::Entities::encode($code).'</pre>');
-  }
-  if ( $#result < '1') {
-    return $result[0];
-  } else {
-    &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");
-    return (@result);
-  }
+    my ($code,$safeeval,$hideerrors) = @_;
+    my @result;
+    $@='';
+    $Apache::run::timeout=0;
+    $main::SIG{'ALRM'} = sub {
+	$Apache::run::timeout=1;
+	die("timeout");
+    };
+    my $innererror;
+    eval {
+	alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
+	@result=$safeeval->reval($code);
+	$innererror=$@;
+	alarm(0);
+    };
+    my $error=$@;
+    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';
+	}
+	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];
+    } else {
+	&Apache::lonxml::debug("<b>Got lots results</b>:$#result:");
+	return (@result);
+    }
 }
 
 sub dump {
@@ -103,7 +138,7 @@ sub dump {
 				$symname.'{$_} } sort keys %'.
 				$symname.')').")"
       }
-      if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />\n"; }
+      if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />"; }
     }
   }
   $dump.='';