Commit af380123 authored by Russ Fish's avatar Russ Fish

Propagate fix: Null string attr comes from XML as an undef value.

parent 292ebd11
...@@ -631,6 +631,9 @@ sub ParseXmlArgs($$$$$$) { ...@@ -631,6 +631,9 @@ sub ParseXmlArgs($$$$$$) {
foreach $key (keys(%{ $xmlparse->{'attribute'} })) { foreach $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -202,6 +202,9 @@ my %newproj_args = (); ...@@ -202,6 +202,9 @@ my %newproj_args = ();
foreach my $key (keys(%{ $xmlparse->{'attribute'} })) { foreach my $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
my $prval = (defined($value) ? $value : "NULL"); my $prval = (defined($value) ? $value : "NULL");
......
...@@ -191,6 +191,9 @@ my %newuser_args = (); ...@@ -191,6 +191,9 @@ my %newuser_args = ();
foreach my $key (keys(%{ $xmlparse->{'attribute'} })) { foreach my $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -186,6 +186,9 @@ my %editexp_args = (); ...@@ -186,6 +186,9 @@ my %editexp_args = ();
foreach my $key (keys(%{ $xmlparse->{'attribute'} })) { foreach my $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -170,6 +170,9 @@ my %editgroup_args = (); ...@@ -170,6 +170,9 @@ my %editgroup_args = ();
foreach $key (keys(%{ $xmlparse->{'attribute'} })) { foreach $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -201,6 +201,9 @@ my $foo; ...@@ -201,6 +201,9 @@ my $foo;
foreach $key (keys(%{ $xmlparse->{'attribute'} })) { foreach $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -226,6 +226,9 @@ my @wildkeys = reverse(sort(keys(%wildcards))); ...@@ -226,6 +226,9 @@ my @wildkeys = reverse(sort(keys(%wildcards)));
foreach $key (keys(%{ $xmlparse->{'attribute'} })) { foreach $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
print STDERR "User attribute: '$key' -> '$value'\n" print STDERR "User attribute: '$key' -> '$value'\n"
if ($debug); if ($debug);
......
...@@ -173,6 +173,9 @@ my %editsitevars_args = (); ...@@ -173,6 +173,9 @@ my %editsitevars_args = ();
foreach $key (keys(%{ $xmlparse->{'attribute'} })) { foreach $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -173,6 +173,9 @@ my %newgroup_args = (); ...@@ -173,6 +173,9 @@ my %newgroup_args = ();
foreach my $key (keys(%{ $xmlparse->{'attribute'} })) { foreach my $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -214,6 +214,9 @@ my @wildkeys = reverse(sort(keys(%wildcards))); ...@@ -214,6 +214,9 @@ my @wildkeys = reverse(sort(keys(%wildcards)));
foreach $key (keys(%{ $xmlparse->{'attribute'} })) { foreach $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
print STDERR "User attribute: '$key' -> '$value'\n" print STDERR "User attribute: '$key' -> '$value'\n"
if ($debug); if ($debug);
......
...@@ -216,6 +216,9 @@ my @wildkeys = reverse(sort(keys(%wildcards))); ...@@ -216,6 +216,9 @@ my @wildkeys = reverse(sort(keys(%wildcards)));
foreach $key (keys(%{ $xmlparse->{'attribute'} })) { foreach $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
print STDERR "User attribute: '$key' -> '$value'\n" print STDERR "User attribute: '$key' -> '$value'\n"
if ($debug); if ($debug);
......
...@@ -175,6 +175,9 @@ my %newmmlist_args = (); ...@@ -175,6 +175,9 @@ my %newmmlist_args = ();
foreach my $key (keys(%{ $xmlparse->{'attribute'} })) { foreach my $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
...@@ -182,6 +182,9 @@ my %newosid_args = (); ...@@ -182,6 +182,9 @@ my %newosid_args = ();
foreach my $key (keys(%{ $xmlparse->{'attribute'} })) { foreach my $key (keys(%{ $xmlparse->{'attribute'} })) {
my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'}; my $value = $xmlparse->{'attribute'}->{"$key"}->{'value'};
if (!defined($value)) { # Empty string comes from XML as an undef value.
$xmlparse->{'attribute'}->{"$key"}->{'value'} = $value = "";
}
if ($debug) { if ($debug) {
print STDERR "User attribute: '$key' -> '$value'\n"; print STDERR "User attribute: '$key' -> '$value'\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment