Diff for /loncom/xml/run.pm between versions 1.29 and 1.31

version 1.29, 2002/05/23 21:15:34 version 1.31, 2002/06/24 21:23:26
Line 29  use HTML::Entities; Line 29  use HTML::Entities;
   
 $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';    $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';  
   my %_LONCAPA_INTERNAL_oldexpressions=();    my %_LONCAPA_INTERNAL_oldexpressions=();
   my $i=0;  
   while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) {    while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) {
     $_LONCAPA_INTERNAL_oldexpressions{$_}=1;      $_LONCAPA_INTERNAL_oldexpressions{$_}=1;
     $_ =~s/((?:\$|\&)(?:[\#|\$]*[A-Za-z][\w]*|\{[A-Za-z][\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;
     if ($i++ > 10 ) { last; }      if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;}
   }    }
 ENDEVALUATE  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; }    if ($Apache::lonxml::evaluate < 1) { return $expression; }
   my $result = '';    my $result = '';
   $@='';    $@='';
   if ($Apache::lonxml::request) {    if ($Apache::lonxml::request) {

Removed from v.1.29  
changed lines
  Added in v.1.31


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