--- loncom/xml/run.pm	2002/05/23 21:12:44	1.28
+++ loncom/xml/run.pm	2002/06/24 21:23:26	1.31
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.28 2002/05/23 21:12:44 albertel Exp $
+# $Id: run.pm,v 1.31 2002/06/24 21:23:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,22 +29,25 @@ 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
 
 sub evaluate {
   my ($expression,$safeeval,$decls) = @_;
   unless (defined($expression)) { return ''; }
-  if (!$Apache::lonxml::evaluate) { return $expression; }
+  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 '') {
@@ -62,9 +65,11 @@ sub run {
   my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";
   $@='';
-  $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
+  if ($Apache::lonxml::request) {
+    $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
+  }
   my (@result)=$safeeval->reval($code);
-  $Apache::lonxml::request->kill_timeout;
+  if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
   my $error=$@;
   if ($error ne '' && !$hideerrors) {
     &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).