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

version 1.26, 2002/04/10 15:22:02 version 1.55, 2006/01/11 08:52:58
Line 27  package Apache::run; Line 27  package Apache::run;
   
 use HTML::Entities;  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/  # $1 will be the variable reference or subroutine name
     if ($i++ > 10 ) { last; }              ((?:\$|\&) #look for a starting $ or &
   }               (?:[\#|\$]* #support $$ or $#$ etc.
                 [A-Za-z][\w]*| # get variable name
                 \{[A-Za-z][\w]*\})) # for ${a}
                # $2 is 0 or more array dereferences []
                #             or  hash dereferences {}
                # the ^$ and ^& is because we do this iteratively
                #    $a[$c] becomes $a[3] which then evaluates
                ([\[\{][^\$\&\]\}]+[\]\}])*?
                # $3 is the list of arguments
                (\([^\$\&\)]+\))*?
                   # only match the above if there is not { [ ( coming up
                   # Why? (I.e. this fails &a(1)[2]
                   (?=[^\[\{\(]|$)/
    my ($__LC__a,$__LC__b,$__LC__c)=($1,$2,$3);
    my $__LC__prefix;
    my $__LC__result;
    while (1) {
        if ($__LC__a =~ m-^&(theta|i|pi|rho)-) { last; }
        { 
    use strict;
    no strict "vars";
    if (eval(defined(eval($__LC__a.$__LC__b)))) {
        $__LC__result= $__LC__prefix.eval($__LC__a.$__LC__b.$__LC__c);
        last;
    }
        }
        $__LC__prefix.=substr($__LC__a,0,1,"");
        if ($__LC__a!~m-^(\$|&|\#)-) { last; }
    }
    if (!defined($__LC__result)) {
        $__LC__result=$__LC__prefix.$__LC__a.$__LC__b.$__LC__c;
    }
    $__LC__result;
                     /sexg;
       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 {   &Apache::lonxml::start_alarm();
     &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=$@;
   }     &Apache::lonxml::end_alarm();
   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::lonnet::perlvar{'lonScriptTimeout'}.' 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') {   &Apache::lonxml::start_alarm();
     return $result[0];   @result=$safeeval->reval($code);
   } else {   $innererror=$@;
     &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");   &Apache::lonxml::end_alarm();
     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::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
    }
    my $errormsg='<pre>'.&HTML::Entities::encode($error,'<>&"').' '.
       &HTML::Entities::encode($innererror,'<>&"').
       '</pre> occured while running <pre>';
    $code=&HTML::Entities::encode($code,'<>&"');
    if ($innererror=~/line (\d+)/) {
       my $linenumber=$1;
       my @code=split("\n",$code);
       $code[$linenumber-1]='<b><font color="red">'.
    $code[$linenumber-1].'</font></b>';
       $code=join("\n",@code);
    }
    &Apache::lonxml::error($errormsg.$code.'</pre>');
       }
       if ( $#result < '1') {
    return $result[0];
       } else {
    &Apache::lonxml::debug("<b>Got lots results</b>:$#result:");
    return (@result);
       }
 }  }
   
 sub dump {  sub dump {
   my ($target,$safeeval)=@_;      my ($target,$safeeval)=@_;
   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!~ /^(INC|SIG)/) && ($symname!~/\027/) &&
       if ($safeeval->reval('defined($'.$symname.')')) {      ($symname!~/^\_/) && ($symname!~/\:$/)) {
  $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";      my $line;
       }      if ($safeeval->reval('defined($'.$symname.')')) {
       if ($safeeval->reval('defined(@'.$symname.')')) {   if ($symname =~ /^\w/) {
  $dump.='@'.$symname.'=('.      $line.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
   $safeeval->reval('join(",",@'.$symname.')').")\n";   }
       }      }
       if ($safeeval->reval('defined(%'.$symname.')')) {      if ($safeeval->reval('defined(@'.$symname.')')) {
  $dump.='%'.$symname.'=(';   $line.='@'.$symname.'=('.
  $dump.=$safeeval->reval('join(",",map { $_."=>".$'.      $safeeval->reval('join(",",@'.$symname.')').")"."\n";
  $symname.'{$_} } sort keys %'.      }
  $symname.')').")\n";      if ($safeeval->reval('defined(%'.$symname.')')) {
       }   $line.='%'.$symname.'=(';
    $line.=$safeeval->reval('join(",",map { $_."=>".$'.
    $symname.'{$_} } sort keys %'.
    $symname.')').")"."\n";
       }
       if ($line ne '') {
    $line=&HTML::Entities::encode($line,'<>&"');
    $line=~s|\n|<br />|g;
    $dump.=$line;
       }
    }
     }      }
   }      $dump.='';
   $dump.='';      return $dump;
   return $dump;  
 }  }
   
 1;  1;

Removed from v.1.26  
changed lines
  Added in v.1.55


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