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

Diff for /loncom/xml/run.pm between versions 1.21 and 1.23

version 1.21, 2001/11/29 19:03:58 version 1.23, 2002/02/15 21:33:12
Line 30  sub evaluateold { Line 30  sub evaluateold {
 # print "inside2 evaluate $decls with $expression<br />\n";  # print "inside2 evaluate $decls with $expression<br />\n";
 # gerd's old method interpolates unset vars  # gerd's old method interpolates unset vars
 # $safeeval->reval('return qq('.$expression.');');  # $safeeval->reval('return qq('.$expression.');');
   unless (defined $expression) { return ''; }    unless (defined($expression)) { return ''; }
   my $result = '';    my $result = '';
   $@='';    $@='';
   $safeeval->reval('$_=q|'.$expression.'|;');    $safeeval->reval('$_=q|'.$expression.'|;');
Line 39  sub evaluateold { Line 39  sub evaluateold {
     if ($@ eq '') {      if ($@ eq '') {
       $result = $safeeval->reval('return $_;');        $result = $safeeval->reval('return $_;');
     } else {      } else {
       &Apache::lonxml::error("substitution on:$expression:with:$decls:caused");        &Apache::lonxml::error("substitution on:$expression:with:$decls:caused:$@:");
     }      }
   } else {    } else {
     &Apache::lonxml::error("defining:$expression:caused");      &Apache::lonxml::error("defining:$expression:caused:$@:");
   }    }
   if ($@ ne '') {&Apache::lonxml::error($@);}  
   return $result    return $result
 }  }
   
Line 58  ENDEVALUATE Line 57  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 80  sub run { Line 79  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 99  sub dump { Line 97  sub dump {
       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.21  
changed lines
  Added in v.1.23

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