loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.416 and 1.417

version 1.416, 2006/09/14 21:52:36	version 1.417, 2006/09/18 21:47:34
Line 1149 sub newparser {	Line 1149 sub newparser {
}	}

sub parstring {	sub parstring {
my ($token) = @_;	my ($token) = @_;
my $temp='';	my (@vars,@values);
foreach (@{$token->[3]}) {	foreach my $attr (@{$token->[3]}) {
unless ($_=~/\W/) {	if ($attr!~/\W/) {
my $val=$token->[2]->{$_};	my $val=$token->[2]->{$attr};
$val =~ s/([\%\@\\\"\'])/\\$1/g;	$val =~ s/([\%\@\\\"\'])/\\$1/g;
$val =~ s/(\$[^{a-zA-Z_])/\\$1/g;	$val =~ s/(\$[^\{a-zA-Z_])/\\$1/g;
$val =~ s/(\$)$/\\$1/;	$val =~ s/(\$)$/\\$1/;
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; }	#if ($val =~ m/^[\%\@]/) { $val="\\".$val; }
$temp .= "my \$$_=\"$val\";";	push(@vars,"\$$attr");
}	push(@values,"\"$val\"");
}	}
return $temp;	}
	my $var_init =
	(@vars) ? 'my ('.join(',',@vars).') = ('.join(',',@values).');'
	: '';
	print STDERR $var_init."\n";
	return $var_init;
}	}

sub extlink {	sub extlink {
Line 1624 sub get_param {	Line 1629 sub get_param {
}	}
if ( ! $args ) { return undef; }	if ( ! $args ) { return undef; }
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)/ei) {
return &Apache::run::run("{$args;".'return $'.$param.'}',	return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'	$safeeval); #'
} else {	} else {
return undef;	return undef;
}	}
} 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 {

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

Removed from v.1.416
changed lines
	Added in v.1.417