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

Diff for /loncom/xml/run.pm between versions 1.19 and 1.24

version 1.19, 2001/10/05 22:27:41 version 1.24, 2002/03/29 18:21:00
Line 1 Line 1
 package Apache::run;  package Apache::run;
   #
 sub evaluateold {  # $Id$
   my ($expression,$safeeval,$decls) = @_;  #
 # print "inside2 evaluate $decls with $expression<br />\n";  # Copyright Michigan State University Board of Trustees
 # gerd's old method interpolates unset vars  #
 # $safeeval->reval('return qq('.$expression.');');  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   unless (defined $expression) { return ''; }  #
   my $result = '';  # 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
   $safeeval->reval('$_=q|'.$expression.'|;');  # the Free Software Foundation; either version 2 of the License, or
   if ($@ eq '') {  # (at your option) any later version.
     $safeeval->reval('{'.$decls.'$_=~s/(\$[A-Za-z]\w*)/(defined(eval($1))?eval($1):$1)/ge;}');  #
     if ($@ eq '') {  # LON-CAPA is distributed in the hope that it will be useful,
       $result = $safeeval->reval('return $_;');  # but WITHOUT ANY WARRANTY; without even the implied warranty of
     } else {  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
       &Apache::lonxml::error("substitution on:$expression:with:$decls:caused");  # GNU General Public License for more details.
     }  #
   } else {  # You should have received a copy of the GNU General Public License
     &Apache::lonxml::error("defining:$expression:caused");  # along with LON-CAPA; if not, write to the Free Software
   }  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   if ($@ ne '') {&Apache::lonxml::error($@);}  #
   return $result  # /home/httpd/html/adm/gpl.txt
 }  #
   # http://www.lon-capa.org/
   #
   
 $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';    $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';  
   my %oldexpressions=();    my %_LONCAPA_INTERNAL_oldexpressions=();
   while (!$oldexpressions{$_}) {    my $i=0;
     $oldexpressions{$_}=1;    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;      $_ =~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; }
   }    }
 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) { return $expression; }
   my $result = '';    my $result = '';
   $@='';    $@='';
Line 55  sub run { Line 59  sub run {
   $@='';    $@='';
   my (@result)=$safeeval->reval($code);    my (@result)=$safeeval->reval($code);
   if ($@ ne '' && !$hideerrors) {    if ($@ ne '' && !$hideerrors) {
     &Apache::lonxml::error(":$code:caused");      &Apache::lonxml::error(":$@: occured while running :$code:");
     &Apache::lonxml::error($@);  
   }    }
   if ( $#result < '1') {    if ( $#result < '1') {
     return $result[0];      return $result[0];
Line 71  sub dump { Line 74  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!~/\:$/)) {
       if ($safeeval->reval('defined $'.$symname)) {        if ($safeeval->reval('defined($'.$symname.')')) {
  $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";   $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
       }        }
       if ($safeeval->reval('defined @'.$symname)) {        if ($safeeval->reval('defined(@'.$symname.')')) {
  $dump.='@'.$symname.'=('.   $dump.='@'.$symname.'=('.
   $safeeval->reval('join(",",@'.$symname.')').")\n";    $safeeval->reval('join(",",@'.$symname.')').")\n";
       }        }
       if ($safeeval->reval('defined %'.$symname)) {        if ($safeeval->reval('defined(%'.$symname.')')) {
  $dump.='%'.$symname.'=(';   $dump.='%'.$symname.'=(';
  $dump.=$safeeval->reval('join(",",map { $_."=>".$'.   $dump.=$safeeval->reval('join(",",map { $_."=>".$'.
  $symname.'{$_} } sort keys %'.   $symname.'{$_} } sort keys %'.
Removed from v.1.19  
changed lines
  Added in v.1.24

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