[BACK]Return to run.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/run.pm between versions 1.4 and 1.8

version 1.4, 2000/06/29 18:53:24 version 1.8, 2000/10/11 13:33:33
Line 2  package Apache::run; Line 2  package Apache::run;
   
 sub evaluate {  sub evaluate {
   my ($expression,$safeeval,$decls) = @_;    my ($expression,$safeeval,$decls) = @_;
 #  print "inside2 evaluate with $expression\n";  # print "inside2 evaluate $decls with $expression<br>\n";
 # gerd's old method interpolates unset vars  # gerd's old method interpolates unset vars
 #  $safeeval->reval('return qq('.$expression.');');  # $safeeval->reval('return qq('.$expression.');');
   $safeeval->reval('$_=\''.$expression.'\';');    unless (defined $expression) { return ''; }
   $safeeval->reval('{'.$decls.'$_=~s/(\$\{?[A-Za-z]\w*\}?)/(defined(eval($1))?eval($1):$1)/ge;}');    my $result = '';
   $safeeval->reval('return $_;');    $@='';
     $safeeval->reval('$_=q{'.$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 {  sub run {
   my ($code,$safeeval) = @_;    my ($code,$safeeval) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $safeeval->reval($code);    $@='';
     my $result=$safeeval->reval($code);
     if ($@ ne '') { 
       &Apache::lonxml::error(":$code:caused"); 
       &Apache::lonxml::error($@); 
     }
     return $result;
 }  }
   
 1;  1;
Removed from v.1.4  
changed lines
  Added in v.1.8

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>