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

Diff for /loncom/xml/run.pm between versions 1.26 and 1.29

version 1.26, 2002/04/10 15:22:02 version 1.29, 2002/05/23 21:15:34
Line 43  sub evaluate { Line 43  sub evaluate {
   if (!$Apache::lonxml::evaluate) { return $expression; }    if (!$Apache::lonxml::evaluate) { return $expression; }
   my $result = '';    my $result = '';
   $@='';    $@='';
     if ($Apache::lonxml::request) {
       $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
     }
   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.    $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');     "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
     if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');  #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
   my $error=$@;    my $error=$@;
   if ($@ eq '') {    if ($@ eq '') {
Line 62  sub run { Line 66  sub run {
   my ($code,$safeeval,$hideerrors) = @_;    my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $@='';    $@='';
     if ($Apache::lonxml::request) {
       $Apache::lonxml::request->hard_timeout("Apache::run::run, evaluation $code");
     }
   my (@result)=$safeeval->reval($code);    my (@result)=$safeeval->reval($code);
     if ($Apache::lonxml::request) { $Apache::lonxml::request->kill_timeout; }
   my $error=$@;    my $error=$@;
   if ($error ne '' && !$hideerrors) {    if ($error ne '' && !$hideerrors) {
     &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).      &Apache::lonxml::error('<pre>'.&HTML::Entities::encode($error).
Line 82  sub dump { Line 90  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.26  
changed lines
  Added in v.1.29

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