Diff for /loncom/xml/run.pm between versions 1.21 and 1.22

version 1.21, 2001/11/29 19:03:58 version 1.22, 2001/12/11 15:48:51
Line 30  sub evaluateold { Line 30  sub evaluateold {
 # print "inside2 evaluate $decls with $expression<br />\n";  # print "inside2 evaluate $decls with $expression<br />\n";
 # gerd's old method interpolates unset vars  # gerd's old method interpolates unset vars
 # $safeeval->reval('return qq('.$expression.');');  # $safeeval->reval('return qq('.$expression.');');
   unless (defined $expression) { return ''; }    unless (defined($expression)) { return ''; }
   my $result = '';    my $result = '';
   $@='';    $@='';
   $safeeval->reval('$_=q|'.$expression.'|;');    $safeeval->reval('$_=q|'.$expression.'|;');
Line 58  ENDEVALUATE Line 58  ENDEVALUATE
   
 sub evaluate {  sub evaluate {
   my ($expression,$safeeval,$decls) = @_;    my ($expression,$safeeval,$decls) = @_;
   unless (defined $expression) { return ''; }    unless (defined($expression)) { return ''; }
   if (!$Apache::lonxml::evaluate) { return $expression; }    if (!$Apache::lonxml::evaluate) { return $expression; }
   my $result = '';    my $result = '';
   $@='';    $@='';
Line 99  sub dump { Line 99  sub dump {
       if ($safeeval->reval('defined($'.$symname.')')) {        if ($safeeval->reval('defined($'.$symname.')')) {
  $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";   $dump.='$'.$symname.'='.$safeeval->reval('$'.$symname)."\n";
       }        }
       if ($safeeval->reval('defined @'.$symname)) {        if ($safeeval->reval('defined(@'.$symname.')')) {
  $dump.='@'.$symname.'=('.   $dump.='@'.$symname.'=('.
   $safeeval->reval('join(",",@'.$symname.')').")\n";    $safeeval->reval('join(",",@'.$symname.')').")\n";
       }        }
       if ($safeeval->reval('defined %'.$symname)) {        if ($safeeval->reval('defined(%'.$symname.')')) {
  $dump.='%'.$symname.'=(';   $dump.='%'.$symname.'=(';
  $dump.=$safeeval->reval('join(",",map { $_."=>".$'.   $dump.=$safeeval->reval('join(",",map { $_."=>".$'.
  $symname.'{$_} } sort keys %'.   $symname.'{$_} } sort keys %'.

Removed from v.1.21  
changed lines
  Added in v.1.22


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