Return to run.pm CVS log

Up to [LON-CAPA] / loncom / xml

- new Apache::run::evaluate() still has quoting problems.

These probably can be gotten around by safe->share()ing a var?

    1: package Apache::run;
    2: 
    3: sub evaluateold {
    4:   my ($expression,$safeeval,$decls) = @_;
    5: # print "inside2 evaluate $decls with $expression<br>\n";
    6: # gerd's old method interpolates unset vars
    7: # $safeeval->reval('return qq('.$expression.');');
    8:   unless (defined $expression) { return ''; }
    9:   my $result = '';
   10:   $@='';
   11:   $safeeval->reval('$_=q|'.$expression.'|;');
   12:   if ($@ eq '') {
   13:     $safeeval->reval('{'.$decls.'$_=~s/(\$[A-Za-z]\w*)/(defined(eval($1))?eval($1):$1)/ge;}');
   14:     if ($@ eq '') {
   15:       $result = $safeeval->reval('return $_;');
   16:     } else {
   17:       &Apache::lonxml::error("substitution on:$expression:with:$decls:caused");
   18:     }
   19:   } else {
   20:     &Apache::lonxml::error("defining:$expression:caused");
   21:   }
   22:   if ($@ ne '') {&Apache::lonxml::error($@);}
   23:   return $result
   24: }
   25: 
   26: sub evaluate {
   27:   my ($expression,$safeeval,$decls) = @_;
   28:   unless (defined $expression) { return ''; }
   29:   my $result = '';
   30:   $@='';
   31:   $safeeval->reval('{'.$decls.';&evaluate(q|'.$expression.'|);}');
   32:   if ($@ eq '') {
   33:     $result = $safeeval->reval('return $_;');
   34:   } else {
   35:     &Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@");
   36:   }  
   37:   return $result
   38: }
   39: 
   40: sub run {
   41:   my ($code,$safeeval) = @_;
   42: #  print "inside run\n";
   43:   $@='';
   44:   my $result=$safeeval->reval($code);
   45:   if ($@ ne '') { 
   46:     &Apache::lonxml::error(":$code:caused"); 
   47:     &Apache::lonxml::error($@); 
   48:   }
   49:   return $result;
   50: }
   51: 
   52: 1;
   53: __END__;