[LON-CAPA-cvs] cvs: loncom /xml run.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 10 Apr 2002 15:22:02 -0000
albertel Wed Apr 10 11:22:02 2002 EDT
Modified files:
/loncom/xml run.pm
Log:
- should improve errormessages quite a bit.
Index: loncom/xml/run.pm
diff -u loncom/xml/run.pm:1.25 loncom/xml/run.pm:1.26
--- loncom/xml/run.pm:1.25 Wed Apr 10 10:46:30 2002
+++ loncom/xml/run.pm Wed Apr 10 11:22:02 2002
@@ -1,6 +1,6 @@
package Apache::run;
#
-# $Id: run.pm,v 1.25 2002/04/10 14:46:30 matthew Exp $
+# $Id: run.pm,v 1.26 2002/04/10 15:22:02 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,6 +25,8 @@
# http://www.lon-capa.org/
#
+use HTML::Entities;
+
$Apache::run::EVALUATE_STRING=<<'ENDEVALUATE';
my %_LONCAPA_INTERNAL_oldexpressions=();
my $i=0;
@@ -44,11 +46,14 @@
$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
# $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
+ my $error=$@;
if ($@ eq '') {
$result = $safeeval->reval('return $_;');
chomp $result;
} 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
}
@@ -58,9 +63,11 @@
# print "inside run\n";
$@='';
my (@result)=$safeeval->reval($code);
- if ($@ ne '' && !$hideerrors) {
- # Put in newline to make display of code easier to read.
- &Apache::lonxml::error(":$@: occured while running :\n$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') {
return $result[0];