version 1.340, 2004/10/05 18:54:49
|
version 1.341, 2004/10/05 20:18:29
|
Line 1028 sub parstring {
|
Line 1028 sub parstring {
|
unless ($_=~/\W/) { |
unless ($_=~/\W/) { |
my $val=$token->[2]->{$_}; |
my $val=$token->[2]->{$_}; |
$val =~ s/([\%\@\\\"\'])/\\$1/g; |
$val =~ s/([\%\@\\\"\'])/\\$1/g; |
|
$val =~ s/^(\$\d)/\\$1/; |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
$temp .= "my \$$_=\"$val\";"; |
$temp .= "my \$$_=\"$val\";"; |
} |
} |
Line 1477 sub get_param_var {
|
Line 1478 sub get_param_var {
|
} 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); #' |
my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #' |
&Apache::lonxml::debug("first run is $value"); |
&Apache::lonxml::debug("first run is $value"); |
if ($value =~ /^[\$\@\%]\w+$/) { |
if ($value =~ /^[\$\@\%][a-zA-Z_]\w*$/) { |
&Apache::lonxml::debug("doing second"); |
&Apache::lonxml::debug("doing second"); |
my @result=&Apache::run::run("return $value",$safeeval,1); |
my @result=&Apache::run::run("return $value",$safeeval,1); |
if (!defined($result[0])) { |
if (!defined($result[0])) { |