loncom/xml/run.pm - diff

Return to run.pm CVS log

Up to [LON-CAPA] / loncom / xml

-version 1.1, 2000/06/28 13:01:52
+version 1.5, 2000/06/29 20:27:44
  Line 1
-         sub evaluate {
+ package Apache::run;
- 	    my ($expression,$safeeval) = @_;
-             return $safeeval->reval($expression);
-         }
-         sub run {
+ sub evaluate {
- 	    my ($code,$safeeval) = @_;
+   my ($expression,$safeeval,$decls) = @_;
-             $safeeval->reval($code);
+ # print "inside2 evaluate with $expression\n";
-         }
+ # gerd's old method interpolates unset vars
+ # $safeeval->reval('return qq('.$expression.');');
+   unless (defined $expression) { return ''; }
+   $safeeval->reval('$_=\''.$expression.'\';');
+   $safeeval->reval('{'.$decls.'$_=~s/(\$\{?[A-Za-z]\w*\}?)/(defined(eval($1))?eval($1):$1)/ge;}');
+   $safeeval->reval('return $_;');
+ }
+ sub run {
+   my ($code,$safeeval) = @_;
+ #  print "inside run\n";
+   $safeeval->reval($code);
+ }
+;
+ __END__;