--- loncom/xml/run.pm 2001/05/04 21:17:24 1.16 +++ loncom/xml/run.pm 2001/11/29 19:03:58 1.21 @@ -1,4 +1,29 @@ package Apache::run; +# +# $Id: run.pm,v 1.21 2001/11/29 19:03:58 www Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# sub evaluateold { my ($expression,$safeeval,$decls) = @_; @@ -37,7 +62,6 @@ sub evaluate { 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.'|);}'); @@ -51,13 +75,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]; @@ -67,5 +91,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__;