--- loncom/xml/lonxml.pm 2006/09/18 21:47:34 1.417 +++ loncom/xml/lonxml.pm 2006/09/26 04:26:15 1.419 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.417 2006/09/18 21:47:34 albertel Exp $ +# $Id: lonxml.pm,v 1.419 2006/09/26 04:26:15 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1165,7 +1165,6 @@ sub parstring { my $var_init = (@vars) ? 'my ('.join(',',@vars).') = ('.join(',',@values).');' : ''; - print STDERR $var_init."\n"; return $var_init; } @@ -1655,10 +1654,10 @@ sub get_param_var { } &Apache::lonxml::debug("Args are $args param is $param"); if ($case_insensitive) { - if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) { + if (! ($args=~s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei)) { return undef; } - } elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; } + } elsif ( $args !~ /my .*\$\Q$param\E[,\)]/ ) { return undef; } my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #' &Apache::lonxml::debug("first run is $value"); if ($value =~ /^[\$\@\%][a-zA-Z_]\w*$/) {