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

Diff for /loncom/xml/run.pm between versions 1.22 and 1.37

version 1.22, 2001/12/11 15:48:51 version 1.37, 2003/06/09 21:37:54
Line 25  package Apache::run; Line 25  package Apache::run;
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
 sub evaluateold {  use HTML::Entities;
   my ($expression,$safeeval,$decls) = @_;  
 # print "inside2 evaluate $decls with $expression<br />\n";  
 # gerd's old method interpolates unset vars  
 # $safeeval->reval('return qq('.$expression.');');  
   unless (defined($expression)) { return ''; }  
   my $result = '';  
   $@='';  
   $safeeval->reval('$_=q|'.$expression.'|;');  
   if ($@ eq '') {  
     $safeeval->reval('{'.$decls.'$_=~s/(\$[A-Za-z]\w*)/(defined(eval($1))?eval($1):$1)/ge;}');  
     if ($@ eq '') {  
       $result = $safeeval->reval('return $_;');  
     } else {  
       &Apache::lonxml::error("substitution on:$expression:with:$decls:caused");  
     }  
   } else {  
     &Apache::lonxml::error("defining:$expression:caused");  
   }  
   if ($@ ne '') {&Apache::lonxml::error($@);}  
   return $result  
 }  
   
 $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';    $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';  
   my %oldexpressions=();    my %_LONCAPA_INTERNAL_oldexpressions=();
   while (!$oldexpressions{$_}) {    while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) {
     $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 (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 ''; }      &Apache::lonxml::debug("got $expression and decls $decls");
   if (!$Apache::lonxml::evaluate) { return $expression; }      unless (defined($expression)) { return ''; }
   my $result = '';      if ($Apache::lonxml::evaluate < 1) { return $expression; }
   $@='';      my $result = '';
   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.      $@='';
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');      $Apache::run::timeout=0;
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');      $main::SIG{'ALRM'} = sub {
   if ($@ eq '') {   $Apache::run::timeout=1;
     $result = $safeeval->reval('return $_;');   die("timeout");
     chomp $result;      };
   } else {      my $innererror;
     &Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@");      eval {
   }     alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
   return $result   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
    $innererror=$@;
    alarm(0);
       };
       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;
   if ($@ ne '' && !$hideerrors) {      $main::SIG{'ALRM'} = sub {
     &Apache::lonxml::error(":$code:caused");   $Apache::run::timeout=1;
     &Apache::lonxml::error($@);   die("timeout");
   }      };
   if ( $#result < '1') {      my $innererror;
     return $result[0];      eval {
   } else {   alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
     &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");   @result=$safeeval->reval($code);
     return (@result);   $innererror=$@;
   }   alarm(0);
       };
       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 96  sub dump { Line 117  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.22  
changed lines
  Added in v.1.37

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