--- loncom/xml/run.pm	2001/11/29 19:03:58	1.21
+++ loncom/xml/run.pm	2002/02/15 21:33:12	1.23
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.21 2001/11/29 19:03:58 www Exp $
+# $Id: run.pm,v 1.23 2002/02/15 21:33:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@ sub evaluateold {
 # print "inside2 evaluate $decls with $expression<br />\n";
 # gerd's old method interpolates unset vars
 # $safeeval->reval('return qq('.$expression.');');
-  unless (defined $expression) { return ''; }
+  unless (defined($expression)) { return ''; }
   my $result = '';
   $@='';
   $safeeval->reval('$_=q|'.$expression.'|;');
@@ -39,12 +39,11 @@ sub evaluateold {
     if ($@ eq '') {
       $result = $safeeval->reval('return $_;');
     } else {
-      &Apache::lonxml::error("substitution on:$expression:with:$decls:caused");
+      &Apache::lonxml::error("substitution on:$expression:with:$decls:caused:$@:");
     }
   } else {
-    &Apache::lonxml::error("defining:$expression:caused");
+    &Apache::lonxml::error("defining:$expression:caused:$@:");
   }
-  if ($@ ne '') {&Apache::lonxml::error($@);}
   return $result
 }
 
@@ -58,7 +57,7 @@ ENDEVALUATE
 
 sub evaluate {
   my ($expression,$safeeval,$decls) = @_;
-  unless (defined $expression) { return ''; }
+  unless (defined($expression)) { return ''; }
   if (!$Apache::lonxml::evaluate) { return $expression; }
   my $result = '';
   $@='';
@@ -80,8 +79,7 @@ sub run {
   $@='';
   my (@result)=$safeeval->reval($code);
   if ($@ ne '' && !$hideerrors) {
-    &Apache::lonxml::error(":$code:caused");
-    &Apache::lonxml::error($@);
+    &Apache::lonxml::error(":$@: occured while running :$code:");
   }
   if ( $#result < '1') {
     return $result[0];
@@ -99,11 +97,11 @@ sub dump {
       if ($safeeval->reval('defined($'.$symname.')')) {
 	$dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
       }	
-      if ($safeeval->reval('defined @'.$symname)) {
+      if ($safeeval->reval('defined(@'.$symname.')')) {
 	$dump.='@'.$symname.'=('.
 	  $safeeval->reval('join(",",@'.$symname.')').")\n";
       }
-      if ($safeeval->reval('defined %'.$symname)) {
+      if ($safeeval->reval('defined(%'.$symname.')')) {
 	$dump.='%'.$symname.'=(';
 	$dump.=$safeeval->reval('join(",",map { $_."=>".$'.
 				$symname.'{$_} } sort keys %'.