loncom/xml/run.pm - diff

Return to run.pm CVS log

Up to [LON-CAPA] / loncom / xml

-version 1.2, 2000/06/28 19:52:20
+version 1.7, 2000/10/02 22:20:18
  Line 1
  package Apache::run;
  sub evaluate {
-   my ($expression,$safeeval) = @_;
+   my ($expression,$safeeval,$decls) = @_;
-   return $safeeval->reval($expression);
+ # print "inside2 evaluate $decls with $expression<br>\n";
+ # gerd's old method interpolates unset vars
+ # $safeeval->reval('return qq('.$expression.');');
+   unless (defined $expression) { return ''; }
+   my $result = '';
+   $@='';
+   $safeeval->reval('$_=\''.$expression.'\';');
+   if ($@ eq '') {
+     $safeeval->reval('{'.$decls.'$_=~s/(\$\{?[A-Za-z]\w*\}?)/(defined(eval($1))?eval($1):$1)/ge;}');
+     if ($@ eq '') {
+       $result = $safeeval->reval('return $_;');
+     } else {
+       &Apache::lonxml::error("substituion on:$expression:with:$decls:caused");
+     }
+   } else {
+     &Apache::lonxml::error("defining:$expression:caused");
+   }
+   if ($@ ne '') {&Apache::lonxml::error($@);}
+   return $result
  }
  sub run {
    my ($code,$safeeval) = @_;
-   $safeeval->reval($code);
+ #  print "inside run\n";
+   $@='';
+   my $result=$safeeval->reval($code);
+   if ($@ ne '') {
+     &Apache::lonxml::error(":$code:caused");
+     &Apache::lonxml::error($@);
+   }
+   return $result;
  }
 ;