loncom/xml/run.pm - diff

Return to run.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/run.pm between versions 1.35 and 1.41

version 1.35, 2003/04/03 14:35:59	version 1.41, 2003/10/01 21:34:53
Line 93 sub run {	Line 93 sub run {
alarm(0);	alarm(0);
};	};
my $error=$@;	my $error=$@;
&Apache::lonxml::debug("run got $@");
if (($Apache::run::timeout \|\| $error ne '' \|\| $innererror ne '') && !$hideerrors) {	if (($Apache::run::timeout \|\| $error ne '' \|\| $innererror ne '') && !$hideerrors) {
if ($Apache::run::timeout) {	if ($Apache::run::timeout) {
$error = 'Code ran too long. It ran for more than '.	$error = 'Code ran too long. It ran for more than '.
Apache->request->server->timeout.' seconds';	Apache->request->server->timeout.' seconds';
}	}
&Apache::lonxml::error('<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> occured while running <pre>';
&HTML::Entities::encode($code).'</pre>');	$code=&HTML::Entities::encode($code);
	if ($innererror=~/line (\d+)/) {
	my $linenumber=$1;
	my @code=split("\n",$code);
	$code[$linenumber-1]='<b><font color="red">'.
	$code[$linenumber-1].'</font></b>';
	$code=join("\n",@code);
	}
	&Apache::lonxml::error($errormsg.$code.'</pre>');
}	}
if ( $#result < '1') {	if ( $#result < '1') {
return $result[0];	return $result[0];
Line 131 sub dump {	Line 138 sub dump {
$symname.'{$_} } sort keys %'.	$symname.'{$_} } sort keys %'.
$symname.')').")"	$symname.')').")"
}	}
if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />\n"; }	if ($line ne '') { $dump.=&HTML::Entities::encode($line)."<br />"; }
}	}
}	}
$dump.='';	$dump.='';

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

Removed from v.1.35
changed lines
	Added in v.1.41