version 1.25, 2002/04/10 14:46:30
|
version 1.26, 2002/04/10 15:22:02
|
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 58 sub run {
|
Line 63 sub run {
|
# print "inside run\n"; |
# print "inside run\n"; |
$@=''; |
$@=''; |
my (@result)=$safeeval->reval($code); |
my (@result)=$safeeval->reval($code); |
if ($@ ne '' && !$hideerrors) { |
my $error=$@; |
# Put in newline to make display of code easier to read. |
if ($error ne '' && !$hideerrors) { |
&Apache::lonxml::error(":$@: occured while running :\n$code"); |
&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]; |