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

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

version 1.24, 2002/03/29 18:21:00 version 1.28, 2002/05/23 21:12:44
Line 25  package Apache::run; Line 25  package Apache::run;
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   use HTML::Entities;
   
 $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';    $Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';  
   my %_LONCAPA_INTERNAL_oldexpressions=();    my %_LONCAPA_INTERNAL_oldexpressions=();
   my $i=0;    my $i=0;
Line 44  sub evaluate { Line 46  sub evaluate {
   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.    $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');     "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');  #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
     my $error=$@;
   if ($@ eq '') {    if ($@ eq '') {
     $result = $safeeval->reval('return $_;');      $result = $safeeval->reval('return $_;');
     chomp $result;      chomp $result;
   } else {    } else {
     &Apache::lonxml::error("substitution on:$expression:with:$decls:caused $@");      &Apache::lonxml::error('substitution on <pre>'.$expression.
      '</pre> with <pre>'.$decls.
      '</pre> caused <pre>'.$error);
   }      }  
   return $result    return $result
 }  }
Line 57  sub run { Line 62  sub run {
   my ($code,$safeeval,$hideerrors) = @_;    my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $@='';    $@='';
     $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
   my (@result)=$safeeval->reval($code);    my (@result)=$safeeval->reval($code);
   if ($@ ne '' && !$hideerrors) {    $Apache::lonxml::request->kill_timeout;
     &Apache::lonxml::error(":$@: occured while running :$code:");    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') {    if ( $#result < '1') {
     return $result[0];      return $result[0];
Line 74  sub dump { Line 84  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!~/\:$/)) {
         my $line;
       if ($safeeval->reval('defined($'.$symname.')')) {        if ($safeeval->reval('defined($'.$symname.')')) {
  $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";   $line='$'.$symname.'='.$safeeval->reval('$'.$symname);
       }        }
       if ($safeeval->reval('defined(@'.$symname.')')) {        if ($safeeval->reval('defined(@'.$symname.')')) {
  $dump.='@'.$symname.'=('.   $line='@'.$symname.'=('.
   $safeeval->reval('join(",",@'.$symname.')').")\n";    $safeeval->reval('join(",",@'.$symname.')').")";
       }        }
       if ($safeeval->reval('defined(%'.$symname.')')) {        if ($safeeval->reval('defined(%'.$symname.')')) {
  $dump.='%'.$symname.'=(';   $line='%'.$symname.'=(';
  $dump.=$safeeval->reval('join(",",map { $_."=>".$'.   $line.=$safeeval->reval('join(",",map { $_."=>".$'.
  $symname.'{$_} } sort keys %'.   $symname.'{$_} } sort keys %'.
  $symname.')').")\n";   $symname.')').")"
       }        }
         if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />\n"; }
     }      }
   }    }
   $dump.='';    $dump.='';
Removed from v.1.24  
changed lines
  Added in v.1.28

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