Fix multinode attribute corruption and increase supported nodes

- Set max supported nodes to 2 instead of 1
- Fixed attribute size computations in attribute compiler

Change-Id: I4449a1a145fae346b3919a2e11ef40a568dabea0
CMVC: 905848
CQ: SW233585
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/7191
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 4 insertions, 37 deletions

diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index e2fa6e6f1..2a59338b8 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -2555,15 +2555,7 @@ sub writeAttrMetadataMapCFile{
             my $keySize = "ATTR_"."$key"."_type";
             if(exists $finalAttrhash{$key}->{simpleType})
             {
-                if(exists $finalAttrhash{$key}->{simpleType}->{string})
-                {
-                    if(exists $finalAttrhash{$key}->{simpleType}->{string}->
-                        {sizeInclNull})
-                    {
-                        $keySize = "$keySize"."[". $finalAttrhash{$key}->
-                            {simpleType}->{string}->{sizeInclNull} . "]";
-                    }
-                }
+                # Nothing to do
             }
             elsif(!(exists $finalAttrhash{$key}->{complexType}) &&
                   !(exists $finalAttrhash{$key}->{nativeType}))
@@ -3262,34 +3254,9 @@ sub writeAttrSizeMapCFile{
                         {
                             # we have the attr here.. calculate the size
                             my $keyVal = "ATTR_"."$key"."_type";
-                            if(exists $attr->{simpleType})
-                            {
-                                if(exists $attr->{simpleType}->{array})
-                                {
-                                    my @splitArrSize = split(',',
-                                            $attr->{simpleType}->{array});
-                                    foreach my $num (@splitArrSize)
-                                    {
-                                        $keyVal = "$keyVal"."[$num]";
-                                    }
-                                }
-                                elsif(exists $attr->{simpleType}->{string})
-                                {
-                                    if(exists $attr->{simpleType}->{string}->
-                                        {sizeInclNull})
-                                    {
-                                        $keyVal = "$keyVal" . "[" .
-                                            $attr->{simpleType}->{string}->
-                                            {sizeInclNull} . "]";
-                                    }
-                                }
-                                $finalAttrhash{$key} = $keyVal;
-                            }
-                            elsif(exists $attr->{complexType})
-                            {
-                                $finalAttrhash{$key} = $keyVal;
-                            }
-                            elsif(exists $attr->{nativeType})
+                            if( (exists $attr->{simpleType}) ||
+                                (exists $attr->{complexType}) ||
+                                (exists $attr->{nativeType}) )
                             {
                                 $finalAttrhash{$key} = $keyVal;
                             }