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

version 1.5, 2000/06/29 20:27:44 version 1.31, 2002/06/24 21:23:26
Line 1 Line 1
 package Apache::run;  package Apache::run;
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   
   use HTML::Entities;
   
   $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';  
     my %_LONCAPA_INTERNAL_oldexpressions=();
     while (!$_LONCAPA_INTERNAL_oldexpressions{$_}) {
       $_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;
       if (scalar(values(%_LONCAPA_INTERNAL_oldexpressions))>10) {last;}
     }
   ENDEVALUATE
   
 sub evaluate {  sub evaluate {
   my ($expression,$safeeval,$decls) = @_;    my ($expression,$safeeval,$decls) = @_;
 # print "inside2 evaluate with $expression\n";    unless (defined($expression)) { return ''; }
 # gerd's old method interpolates unset vars    if ($Apache::lonxml::evaluate < 1) { return $expression; }
 # $safeeval->reval('return qq('.$expression.');');    my $result = '';
   unless (defined $expression) { return ''; }    $@='';
   $safeeval->reval('$_=\''.$expression.'\';');    if ($Apache::lonxml::request) {
   $safeeval->reval('{'.$decls.'$_=~s/(\$\{?[A-Za-z]\w*\}?)/(defined(eval($1))?eval($1):$1)/ge;}');      $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
   $safeeval->reval('return $_;');    }
     $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
      "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
     if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
   #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
     my $error=$@;
     if ($@ eq '') {
       $result = $safeeval->reval('return $_;');
       chomp $result;
     } else {
       &Apache::lonxml::error('substitution on <pre>'.$expression.
      '</pre> with <pre>'.$decls.
      '</pre> caused <pre>'.$error);
     }  
     return $result
 }  }
   
 sub run {  sub run {
   my ($code,$safeeval) = @_;    my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $safeeval->reval($code);    $@='';
     if ($Apache::lonxml::request) {
       $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
     }
     my (@result)=$safeeval->reval($code);
     if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
     my $error=$@;
     if ($error ne '' && !$hideerrors) {
       &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).
      '</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 {
     my ($target,$safeeval)=@_;
     my $dump='';
     foreach my $symname (sort keys %{$safeeval->varglob('main::')}) {
       if (($symname!~/^\_/) && ($symname!~/\:$/)) {
         my $line;
         if ($safeeval->reval('defined($'.$symname.')')) {
    $line='$'.$symname.'='.$safeeval->reval('$'.$symname);
         }
         if ($safeeval->reval('defined(@'.$symname.')')) {
    $line='@'.$symname.'=('.
     $safeeval->reval('join(",",@'.$symname.')').")";
         }
         if ($safeeval->reval('defined(%'.$symname.')')) {
    $line='%'.$symname.'=(';
    $line.=$safeeval->reval('join(",",map { $_."=>".$'.
    $symname.'{$_} } sort keys %'.
    $symname.')').")"
         }
         if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />\n"; }
       }
     }
     $dump.='';
     return $dump;
 }  }
   
 1;  1;

Removed from v.1.5  
changed lines
  Added in v.1.31


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