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

Diff for /loncom/xml/run.pm between versions 1.13 and 1.17

version 1.13, 2000/11/20 17:34:05 version 1.17, 2001/05/21 03:28:24
Line 2  package Apache::run; Line 2  package Apache::run;
   
 sub evaluateold {  sub evaluateold {
   my ($expression,$safeeval,$decls) = @_;    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  # gerd's old method interpolates unset vars
 # $safeeval->reval('return qq('.$expression.');');  # $safeeval->reval('return qq('.$expression.');');
   unless (defined $expression) { return ''; }    unless (defined $expression) { return ''; }
Line 34  ENDEVALUATE Line 34  ENDEVALUATE
 sub evaluate {  sub evaluate {
   my ($expression,$safeeval,$decls) = @_;    my ($expression,$safeeval,$decls) = @_;
   unless (defined $expression) { return ''; }    unless (defined $expression) { return ''; }
     if (!$Apache::lonxml::evaluate) { return $expression; }
   my $result = '';    my $result = '';
   $@='';    $@='';
   print $decls  
   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.    $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');     "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');  #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
Line 53  sub run { Line 53  sub run {
   my ($code,$safeeval) = @_;    my ($code,$safeeval) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $@='';    $@='';
   my $result=$safeeval->reval($code);    my (@result)=$safeeval->reval($code);
   if ($@ ne '') {     if ($@ ne '') { 
     &Apache::lonxml::error(":$code:caused");       &Apache::lonxml::error(":$code:caused"); 
     &Apache::lonxml::error($@);       &Apache::lonxml::error($@); 
   }    }
   return $result;    if ( $#result < '1') {
       return $result[0];
     } else {
       &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");
       return (@result);
     }
 }  }
   
 1;  1;
Removed from v.1.13  
changed lines
  Added in v.1.17

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