--- loncom/xml/run.pm	2002/03/29 18:21:00	1.24
+++ loncom/xml/run.pm	2002/05/24 16:48:50	1.30
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.24 2002/03/29 18:21:00 albertel Exp $
+# $Id: run.pm,v 1.30 2002/05/24 16:48:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,13 +25,14 @@ package Apache::run;
 # http://www.lon-capa.org/
 #
 
+use HTML::Entities;
+
 $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';  
   my %_LONCAPA_INTERNAL_oldexpressions=();
-  my $i=0;
   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;
-    if ($i++ > 10 ) { last; }
+    if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;}
   }
 ENDEVALUATE
 
@@ -41,14 +42,21 @@ sub evaluate {
   if (!$Apache::lonxml::evaluate) { 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:$expression:with:$decls:caused $@");
+    &Apache::lonxml::error('substitution on <pre>'.$expression.
+			   '</pre> with <pre>'.$decls.
+			   '</pre> caused <pre>'.$error);
   }  
   return $result
 }
@@ -57,9 +65,16 @@ 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 ($@ ne '' && !$hideerrors) {
-    &Apache::lonxml::error(":$@: occured while running :$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];
@@ -74,19 +89,21 @@ sub dump {
   my $dump='';
   foreach my $symname (sort keys %{$safeeval->varglob('main::')}) {
     if (($symname!~/^\_/) && ($symname!~/\:$/)) {
+      my $line;
       if ($safeeval->reval('defined($'.$symname.')')) {
-	$dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
+	$line='$'.$symname.'='.$safeeval->reval('$'.$symname);
       }	
       if ($safeeval->reval('defined(@'.$symname.')')) {
-	$dump.='@'.$symname.'=('.
-	  $safeeval->reval('join(",",@'.$symname.')').")\n";
+	$line='@'.$symname.'=('.
+	  $safeeval->reval('join(",",@'.$symname.')').")";
       }
       if ($safeeval->reval('defined(%'.$symname.')')) {
-	$dump.='%'.$symname.'=(';
-	$dump.=$safeeval->reval('join(",",map { $_."=>".$'.
+	$line='%'.$symname.'=(';
+	$line.=$safeeval->reval('join(",",map { $_."=>".$'.
 				$symname.'{$_} } sort keys %'.
-				$symname.')').")\n";
+				$symname.')').")"
       }
+      if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />\n"; }
     }
   }
   $dump.='';