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

Diff for /loncom/xml/run.pm between versions 1.41 and 1.51

version 1.41, 2003/10/01 21:34:53 version 1.51, 2005/02/28 22:17:09
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=();
   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
               ((?:\$|\&) #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) {
        { 
    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;}      if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;}
   }  }
 ENDEVALUATE  ENDEVALUATE
   
 sub evaluate {  sub evaluate {
Line 49  sub evaluate { Line 83  sub evaluate {
     };      };
     my $innererror;      my $innererror;
     eval {      eval {
  alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});   &Apache::lonxml::start_alarm();
  $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
  "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');   "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
  $innererror=$@;   $innererror=$@;
  alarm(0);   &Apache::lonxml::end_alarm();
     };      };
     my $error=$@;      my $error=$@; 
     if ($error eq '' && $innererror eq '' && !$Apache::run::timeout) {      if ($error eq '' && $innererror eq '' && !$Apache::run::timeout) {
  $result = $safeeval->reval('return $_;');   $result = $safeeval->reval('return $_;');
  chomp $result;   chomp $result;
     } else {      } else {
  if ($Apache::run::timeout) {   if ($Apache::run::timeout) {
     $error = 'Code ran too long. It ran for more than '.      $error = 'Code ran too long. It ran for more than '.
  Apache->request->server->timeout.' seconds';   $Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
  }   }
  &Apache::lonxml::error('substitution on <pre>'.   &Apache::lonxml::error('substitution on <pre>'.
        &HTML::Entities::encode($expression).         &HTML::Entities::encode($expression,'<>&"').
        '</pre> with <pre>'.         '</pre> with <pre>'.
        &HTML::Entities::encode($decls).         &HTML::Entities::encode($decls,'<>&"').
        '</pre> caused <pre>'.         '</pre> caused <pre>'.
        &HTML::Entities::encode($error).' '.         &HTML::Entities::encode($error,'<>&"').' '.
        &HTML::Entities::encode($innererror).         &HTML::Entities::encode($innererror,'<>&"').
        '</pre>');         '</pre>');
     }      }
     return $result      return $result
Line 87  sub run { Line 121  sub run {
     };      };
     my $innererror;      my $innererror;
     eval {      eval {
  alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});   &Apache::lonxml::start_alarm();
  @result=$safeeval->reval($code);   @result=$safeeval->reval($code);
  $innererror=$@;   $innererror=$@;
  alarm(0);   &Apache::lonxml::end_alarm();
     };      };
     my $error=$@;      my $error=$@;
     if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) {      if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) {
  if ($Apache::run::timeout) {   if ($Apache::run::timeout) {
     $error = 'Code ran too long. It ran for more than '.      $error = 'Code ran too long. It ran for more than '.
  Apache->request->server->timeout.' seconds';   $Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
  }   }
  my $errormsg='<pre>'.&HTML::Entities::encode($error).' '.   my $errormsg='<pre>'.&HTML::Entities::encode($error,'<>&"').' '.
     &HTML::Entities::encode($innererror).      &HTML::Entities::encode($innererror,'<>&"').
     '</pre> occured while running <pre>';      '</pre> occured while running <pre>';
  $code=&HTML::Entities::encode($code);   $code=&HTML::Entities::encode($code,'<>&"');
  if ($innererror=~/line (\d+)/) {   if ($innererror=~/line (\d+)/) {
     my $linenumber=$1;      my $linenumber=$1;
     my @code=split("\n",$code);      my @code=split("\n",$code);
Line 120  sub run { Line 154  sub run {
 }  }
   
 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!~/^\_/) && ($symname!~/\:$/)) {
       my $line;      my $line;
       if ($safeeval->reval('defined($'.$symname.')')) {      if ($safeeval->reval('defined($'.$symname.')')) {
  $line='$'.$symname.'='.$safeeval->reval('$'.$symname);   if ($symname =~ /^\w/) {
       }      $line.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
       if ($safeeval->reval('defined(@'.$symname.')')) {   }
  $line='@'.$symname.'=('.      }
   $safeeval->reval('join(",",@'.$symname.')').")";      if ($safeeval->reval('defined(@'.$symname.')')) {
       }   $line.='@'.$symname.'=('.
       if ($safeeval->reval('defined(%'.$symname.')')) {      $safeeval->reval('join(",",@'.$symname.')').")"."\n";
  $line='%'.$symname.'=(';      }
  $line.=$safeeval->reval('join(",",map { $_."=>".$'.      if ($safeeval->reval('defined(%'.$symname.')')) {
  $symname.'{$_} } sort keys %'.   $line.='%'.$symname.'=(';
  $symname.')').")"   $line.=$safeeval->reval('join(",",map { $_."=>".$'.
       }   $symname.'{$_} } sort keys %'.
       if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />"; }   $symname.')').")"."\n"
       }
       if ($line ne '') {
    $line=&HTML::Entities::encode($line,'<>&"');
    $line=~s|\n|<br />|;
    $dump.=$line;
       }
    }
     }      }
   }      $dump.='';
   $dump.='';      return $dump;
   return $dump;  
 }  }
   
 1;  1;
Removed from v.1.41  
changed lines
  Added in v.1.51

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