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

Diff for /loncom/xml/run.pm between versions 1.11 and 1.14

version 1.11, 2000/11/15 15:29:33 version 1.14, 2001/01/04 19:14:10
Line 27  $Apache::run::EVALUATE_STRING=<<'ENDEVAL Line 27  $Apache::run::EVALUATE_STRING=<<'ENDEVAL
   my %oldexpressions=();    my %oldexpressions=();
   while (!$oldexpressions{$_}) {    while (!$oldexpressions{$_}) {
     $oldexpressions{$_}=1;      $oldexpressions{$_}=1;
     $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[|\{][\w\'\"]+[\]\}])*?(\([\w\'\"]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg;      $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\w]*\}))([\[\{][^\$\&\]\}]+[\]\}])*?(\([^\$\&\)]+\))*?(?=[^\[\{\(]|$)/eval(defined(eval($1.$2))?eval('$1.$2.$3'):'$1.$2.$3')/seg;
   }    }
 ENDEVALUATE  ENDEVALUATE
   
Line 42  sub evaluate { Line 42  sub evaluate {
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');  #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
   if ($@ eq '') {    if ($@ eq '') {
     $result = $safeeval->reval('return $_;');      $result = $safeeval->reval('return $_;');
       chomp $result;
   } else {    } else {
     &Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@");      &Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@");
   }      }  
Line 52  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.11  
changed lines
  Added in v.1.14

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