version 1.229, 2003/02/12 20:43:18
|
version 1.232, 2003/02/13 21:14:35
|
Line 603 sub xmlparse {
|
Line 603 sub xmlparse {
|
my ($request,$target,$content_file_string,$safeinit,%style_for_target) = @_; |
my ($request,$target,$content_file_string,$safeinit,%style_for_target) = @_; |
|
|
&setup_globals($request,$target); |
&setup_globals($request,$target); |
|
&Apache::inputtags::initialize_inputtags(); |
|
&Apache::outputtags::initialize_outputtags(); |
|
&Apache::edit::initialize_edit(); |
# |
# |
# do we have a course style file? |
# do we have a course style file? |
# |
# |
Line 1216 sub parstring {
|
Line 1219 sub parstring {
|
foreach (@{$token->[3]}) { |
foreach (@{$token->[3]}) { |
unless ($_=~/\W/) { |
unless ($_=~/\W/) { |
my $val=$token->[2]->{$_}; |
my $val=$token->[2]->{$_}; |
$val =~ s/([\%\@\\\"])/\\$1/g; |
$val =~ s/([\%\@\\\"\'])/\\$1/g; |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
$temp .= "my \$$_=\"$val\";" |
$temp .= "my \$$_=\"$val\";" |
} |
} |
Line 1506 sub get_param_var {
|
Line 1509 sub get_param_var {
|
if ( ! $context ) { $context = -1; } |
if ( ! $context ) { $context = -1; } |
my $args =''; |
my $args =''; |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
|
&Apache::lonxml::debug("Args are $args param is $param"); |
if ($case_insensitive) { |
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).$3/ei)) { |
return undef; |
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); #' |
my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #' |
if ($value =~ /^[\$\@\%]/) { |
&Apache::lonxml::debug("first run is $value"); |
return &Apache::run::run("return $value",$safeeval,1); |
if ($value =~ /^[\$\@\%]\w+$/) { |
|
&Apache::lonxml::debug("doing second"); |
|
my @result=&Apache::run::run("return $value",$safeeval,1); |
|
if (!defined($result[0])) { |
|
return $value |
|
} else { |
|
if (wantarray) { return @result; } else { return $result[0]; } |
|
} |
} else { |
} else { |
return $value; |
return $value; |
} |
} |