--- loncom/xml/run.pm	2000/11/20 17:34:05	1.13
+++ loncom/xml/run.pm	2001/05/04 21:17:24	1.16
@@ -2,7 +2,7 @@ package Apache::run;
 
 sub evaluateold {
   my ($expression,$safeeval,$decls) = @_;
-# print "inside2 evaluate $decls with $expression<br>\n";
+# print "inside2 evaluate $decls with $expression<br />\n";
 # gerd's old method interpolates unset vars
 # $safeeval->reval('return qq('.$expression.');');
   unless (defined $expression) { return ''; }
@@ -34,6 +34,7 @@ ENDEVALUATE
 sub evaluate {
   my ($expression,$safeeval,$decls) = @_;
   unless (defined $expression) { return ''; }
+  if (!$Apache::lonxml::evaluate) { return $expression; }
   my $result = '';
   $@='';
   print $decls
@@ -53,12 +54,17 @@ sub run {
   my ($code,$safeeval) = @_;
 #  print "inside run\n";
   $@='';
-  my $result=$safeeval->reval($code);
+  my (@result)=$safeeval->reval($code);
   if ($@ ne '') { 
     &Apache::lonxml::error(":$code:caused"); 
     &Apache::lonxml::error($@); 
   }
-  return $result;
+  if ( $#result < '1') {
+    return $result[0];
+  } else {
+    &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");
+    return (@result);
+  }
 }
 
 1;