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

Diff for /loncom/xml/run.pm between versions 1.52 and 1.61

version 1.52, 2005/10/04 16:30:23 version 1.61, 2012/12/18 18:27:43
Line 50  while (!$_LONCAPA_INTERNAL_oldexpression Line 50  while (!$_LONCAPA_INTERNAL_oldexpression
  my $__LC__prefix;   my $__LC__prefix;
  my $__LC__result;   my $__LC__result;
  while (1) {   while (1) {
        if ($__LC__a =~ m-^&(theta|pi|rho)$-) { last; }
      {        { 
  use strict;   use strict;
  no strict "vars";   no strict "vars";
Line 77  sub evaluate { Line 78  sub evaluate {
     my $result = '';      my $result = '';
     $@='';      $@='';
     $Apache::run::timeout=0;      $Apache::run::timeout=0;
     $main::SIG{'ALRM'} = sub {      local $main::SIG{'ALRM'} = sub {
  $Apache::run::timeout=1;   $Apache::run::timeout=1;
  die("timeout");   die("timeout");
     };      };
Line 115  sub run { Line 116  sub run {
     my @result;      my @result;
     $@='';      $@='';
     $Apache::run::timeout=0;      $Apache::run::timeout=0;
     $main::SIG{'ALRM'} = sub {      local $main::SIG{'ALRM'} = sub {
  $Apache::run::timeout=1;   $Apache::run::timeout=1;
  die("timeout");   die("timeout");
     };      };
Line 134  sub run { Line 135  sub run {
  }   }
  my $errormsg='<pre>'.&HTML::Entities::encode($error,'<>&"').' '.   my $errormsg='<pre>'.&HTML::Entities::encode($error,'<>&"').' '.
     &HTML::Entities::encode($innererror,'<>&"').      &HTML::Entities::encode($innererror,'<>&"').
     '</pre> occured while running <pre>';      '</pre> occurred while running <pre>';
  $code=&HTML::Entities::encode($code,'<>&"');   $code=&HTML::Entities::encode($code,'<>&"');
  if ($innererror=~/line (\d+)/) {   if ($innererror=~/line (\d+)/) {
     my $linenumber=$1;      my $linenumber=$1;
     my @code=split("\n",$code);      my @code=split("\n",$code);
     $code[$linenumber-1]='<b><font color="red">'.      if ($linenumber < scalar(@code)) {
  $code[$linenumber-1].'</font></b>';   $code[$linenumber-1]='<b><font color="red">'.
       $code[$linenumber-1].'</font></b>';
       }
     $code=join("\n",@code);      $code=join("\n",@code);
  }   }
  &Apache::lonxml::error($errormsg.$code.'</pre>');   &Apache::lonxml::error($errormsg.$code.'</pre>');
Line 157  sub dump { Line 160  sub dump {
     my ($target,$safeeval)=@_;      my ($target,$safeeval)=@_;
     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!~ /^(INC|SIG)/) && ($symname!~/\027/) &&
       ($symname!~/^\_/) && ($symname!~/\:$/)) {
     my $line;      my $line;
     if ($safeeval->reval('defined($'.$symname.')')) {      if ($safeeval->reval('defined($'.$symname.')')) {
  if ($symname =~ /^\w/) {   if ($symname =~ /^\w/) {
     $line.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";      $line.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
  }   }
     }      }
     if ($safeeval->reval('defined(@'.$symname.')')) {      if ($safeeval->reval('@'.$symname)) {
  $line.='@'.$symname.'=('.   $line.='@'.$symname.'=('.
     $safeeval->reval('join(",",@'.$symname.')').")"."\n";      $safeeval->reval('join(",",@'.$symname.')').")"."\n";
     }      }
     if ($safeeval->reval('defined(%'.$symname.')')) {      if ($safeeval->reval('%'.$symname)) {
  $line.='%'.$symname.'=(';   $line.='%'.$symname.'=(';
  $line.=$safeeval->reval('join(",",map { $_."=>".$'.   $line.=$safeeval->reval('join(",",map { $_."=>".$'.
  $symname.'{$_} } sort keys %'.   $symname.'{$_} } sort keys %'.
  $symname.')').")"."\n"   $symname.')').")"."\n";
     }      }
     if ($line ne '') {      if ($line ne '') {
  $line=&HTML::Entities::encode($line,'<>&"');   $line=&HTML::Entities::encode($line,'<>&"');
  $line=~s|\n|<br />|g;   $line=~s|\n|<br />|g;
Line 187  sub dump { Line 191  sub dump {
   
 1;  1;
 __END__;  __END__;
   
   =pod
   
   =head1 NAME
   
   Apache::run.pm
   
   =head1 SYNOPSIS
   
   Used to prevent poorly written problems from
   causing lingering after effects
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   
   =head1 NOTABLE SUBROUTINES
   
   =over
   
   =item run(), dump(), evaluate()
   
   =back
   
   =cut
   
Removed from v.1.52  
changed lines
  Added in v.1.61

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