loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

version 1.534, 2012/11/29 20:47:11	version 1.535, 2012/11/30 11:45:57
Line 2050 sub add_messages {	Line 2050 sub add_messages {
}	}

sub get_param {	sub get_param {
my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;	my ($param,$parstack,$safeeval,$context,$case_insensitive, $noelide) = @_;

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]; }
if ( ! $Apache::lonxml::usestyle ) {	if ( ! $Apache::lonxml::usestyle ) {
$args=$Apache::lonxml::style_values.$args;	$args=$Apache::lonxml::style_values.$args;
}	}


	if ($noelide) {
	# $args =~ s/\\'/'/g;
	$args =~ s/'\$/'\\\$/g;
	}

if ( ! $args ) { return undef; }	if ( ! $args ) { return undef; }
if ( $case_insensitive ) {	if ( $case_insensitive ) {
if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) {	if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) {

return &Apache::run::run("{$args;".'return $'.$param.'}',	return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'	$safeeval); #'
} else {	} else {
Line 2067 sub get_param {	Line 2076 sub get_param {
}	}
} else {	} else {
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {	if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {

return &Apache::run::run("{$args;".'return $'.$param.'}',	return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'	$safeeval); #'
} else {	} else {