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

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

version 1.28, 2002/05/23 21:12:44 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) {
       $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
     }
   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.    $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');     "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
     if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');  #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
   my $error=$@;    my $error=$@;
   if ($@ eq '') {    if ($@ eq '') {
Line 62  sub run { Line 65  sub run {
   my ($code,$safeeval,$hideerrors) = @_;    my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $@='';    $@='';
   $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");    if ($Apache::lonxml::request) {
       $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
     }
   my (@result)=$safeeval->reval($code);    my (@result)=$safeeval->reval($code);
   $Apache::lonxml::request->kill_timeout;    if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
   my $error=$@;    my $error=$@;
   if ($error ne '' && !$hideerrors) {    if ($error ne '' && !$hideerrors) {
     &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).      &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).
Removed from v.1.28  
changed lines
  Added in v.1.31

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