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

Diff for /loncom/xml/run.pm between versions 1.26 and 1.36

version 1.26, 2002/04/10 15:22:02 version 1.36, 2003/04/03 21:58:40
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 = '';
   $@='';      $@='';
   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.      $Apache::run::timeout=0;
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');      $main::SIG{'ALRM'} = sub {
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');   $Apache::run::timeout=1;
   my $error=$@;   die("timeout");
   if ($@ eq '') {      };
     $result = $safeeval->reval('return $_;');      my $innererror;
     chomp $result;      eval {
   } else {   alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
     &Apache::lonxml::error('substitution on <pre>'.$expression.   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
    '</pre> with <pre>'.$decls.   "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
    '</pre> caused <pre>'.$error);   $innererror=$@;
   }     alarm(0);
   return $result      };
       my $error=$@;
       if ($error eq '' && $innererror eq '' && !$Apache::run::timeout) {
    $result = $safeeval->reval('return $_;');
    chomp $result;
       } else {
    if ($Apache::run::timeout) {
       $error = 'Code ran too long. It ran for more than '.
    Apache->request->server->timeout.' seconds';
    }
    &Apache::lonxml::error('substitution on <pre>'.
          &HTML::Entities::encode($expression).
          '</pre> with <pre>'.
          &HTML::Entities::encode($decls).
          '</pre> caused <pre>'.
          &HTML::Entities::encode($error).' '.
          &HTML::Entities::encode($innererror).
          '</pre>');
       }
       return $result
 }  }
   
 sub run {  sub run {
   my ($code,$safeeval,$hideerrors) = @_;      my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";      my @result;
   $@='';      $@='';
   my (@result)=$safeeval->reval($code);      $Apache::run::timeout=0;
   my $error=$@;      $main::SIG{'ALRM'} = sub {
   if ($error ne '' && !$hideerrors) {   $Apache::run::timeout=1;
     &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).   die("timeout");
    '</pre> occured while running <pre>'.      };
    &HTML::Entities::encode($code).'</pre>');      my $innererror;
   }      eval {
   if ( $#result < '1') {   alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
     return $result[0];   @result=$safeeval->reval($code);
   } else {   $innererror=$@;
     &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");   alarm(0);
     return (@result);      };
   }      my $error=$@;
       if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) {
    if ($Apache::run::timeout) {
       $error = 'Code ran too long. It ran for more than '.
    Apache->request->server->timeout.' seconds';
    }
    &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).' '.
          &HTML::Entities::encode($innererror).
          '</pre> occured while running <pre>'.
          &HTML::Entities::encode($code).'</pre>');
       }
       if ( $#result < '1') {
    return $result[0];
       } else {
    &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");
    return (@result);
       }
 }  }
   
 sub dump {  sub dump {
Line 82  sub dump { Line 116  sub dump {
   my $dump='';    my $dump='';
   foreach my $symname (sort keys %{$safeeval->varglob('main::')}) {    foreach my $symname (sort keys %{$safeeval->varglob('main::')}) {
     if (($symname!~/^\_/) && ($symname!~/\:$/)) {      if (($symname!~/^\_/) && ($symname!~/\:$/)) {
         my $line;
       if ($safeeval->reval('defined($'.$symname.')')) {        if ($safeeval->reval('defined($'.$symname.')')) {
  $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";   $line='$'.$symname.'='.$safeeval->reval('$'.$symname);
       }        }
       if ($safeeval->reval('defined(@'.$symname.')')) {        if ($safeeval->reval('defined(@'.$symname.')')) {
  $dump.='@'.$symname.'=('.   $line='@'.$symname.'=('.
   $safeeval->reval('join(",",@'.$symname.')').")\n";    $safeeval->reval('join(",",@'.$symname.')').")";
       }        }
       if ($safeeval->reval('defined(%'.$symname.')')) {        if ($safeeval->reval('defined(%'.$symname.')')) {
  $dump.='%'.$symname.'=(';   $line='%'.$symname.'=(';
  $dump.=$safeeval->reval('join(",",map { $_."=>".$'.   $line.=$safeeval->reval('join(",",map { $_."=>".$'.
  $symname.'{$_} } sort keys %'.   $symname.'{$_} } sort keys %'.
  $symname.')').")\n";   $symname.')').")"
       }        }
         if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />\n"; }
     }      }
   }    }
   $dump.='';    $dump.='';
Removed from v.1.26  
changed lines
  Added in v.1.36

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