--- loncom/xml/run.pm 2001/02/19 20:43:00 1.15 +++ loncom/xml/run.pm 2001/10/05 22:27:41 1.19 @@ -34,9 +34,9 @@ ENDEVALUATE sub evaluate { my ($expression,$safeeval,$decls) = @_; unless (defined $expression) { return ''; } + if (!$Apache::lonxml::evaluate) { return $expression; } my $result = ''; $@=''; - print $decls $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression. "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}'); # $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}'); @@ -50,13 +50,13 @@ sub evaluate { } sub run { - my ($code,$safeeval) = @_; + my ($code,$safeeval,$hideerrors) = @_; # print "inside run\n"; $@=''; my (@result)=$safeeval->reval($code); - if ($@ ne '') { - &Apache::lonxml::error(":$code:caused"); - &Apache::lonxml::error($@); + if ($@ ne '' && !$hideerrors) { + &Apache::lonxml::error(":$code:caused"); + &Apache::lonxml::error($@); } if ( $#result < '1') { return $result[0]; @@ -66,5 +66,29 @@ sub run { } } +sub dump { + my ($target,$safeeval)=@_; + my $dump=''; + foreach my $symname (sort keys %{$safeeval->varglob('main::')}) { + if (($symname!~/^\_/) && ($symname!~/\:$/)) { + if ($safeeval->reval('defined $'.$symname)) { + $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n"; + } + if ($safeeval->reval('defined @'.$symname)) { + $dump.='@'.$symname.'=('. + $safeeval->reval('join(",",@'.$symname.')').")\n"; + } + if ($safeeval->reval('defined %'.$symname)) { + $dump.='%'.$symname.'=('; + $dump.=$safeeval->reval('join(",",map { $_."=>".$'. + $symname.'{$_} } sort keys %'. + $symname.')').")\n"; + } + } + } + $dump.=''; + return $dump; +} + 1; __END__;