Skip to content

Commit 28e94e2

Browse files
rouaultrouault
authored
Merge pull request OSGeo#12036 from rouault/fix_12027
GMLAS: fix reading multiple values of a StringList field that is a repeated element
2 parents 1f1b80b + 23e4c57 commit 28e94e2

10 files changed

+201
-1
lines changed

‎autotest/ogr/data/gmlas/choice_double_inlined.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<l:main xmlns:l="http://example.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://example.com" xsi:schemaLocation="http://example.com choice_double_inlined.xsd">
3+
<l:a>
4+
<l:b double_attr="1.5"/>
5+
<l:b double_attr="2.5"/>
6+
</l:a>
7+
</l:main>

‎autotest/ogr/data/gmlas/choice_double_inlined.xsd

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xs:schema xmlns:l="http://example.com" targetNamespace="http://example.com" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
3+
<xs:element name="main" type="l:main" abstract="false">
4+
</xs:element>
5+
<xs:complexType name="main" abstract="false">
6+
<xs:sequence>
7+
<xs:element name="a" minOccurs="1" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:choice minOccurs="1" maxOccurs="unbounded">
10+
<xs:element ref="l:b"/>
11+
</xs:choice>
12+
</xs:complexType>
13+
</xs:element>
14+
</xs:sequence>
15+
</xs:complexType>
16+
<xs:element name="b" type="l:b" abstract="false"/>
17+
<xs:complexType name="b" abstract="false">
18+
<xs:attribute name="double_attr" type="xs:double" use="required"/>
19+
</xs:complexType>
20+
</xs:schema>

‎autotest/ogr/data/gmlas/choice_int64_inlined.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<l:main xmlns:l="http://example.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://example.com" xsi:schemaLocation="http://example.com choice_int64_inlined.xsd">
3+
<l:a>
4+
<l:b int64_attr="123456789123"/>
5+
<l:b int64_attr="2"/>
6+
</l:a>
7+
</l:main>

‎autotest/ogr/data/gmlas/choice_int64_inlined.xsd

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xs:schema xmlns:l="http://example.com" targetNamespace="http://example.com" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
3+
<xs:element name="main" type="l:main" abstract="false">
4+
</xs:element>
5+
<xs:complexType name="main" abstract="false">
6+
<xs:sequence>
7+
<xs:element name="a" minOccurs="1" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:choice minOccurs="1" maxOccurs="unbounded">
10+
<xs:element ref="l:b"/>
11+
</xs:choice>
12+
</xs:complexType>
13+
</xs:element>
14+
</xs:sequence>
15+
</xs:complexType>
16+
<xs:element name="b" type="l:b" abstract="false"/>
17+
<xs:complexType name="b" abstract="false">
18+
<xs:attribute name="int64_attr" type="xs:long" use="required"/>
19+
</xs:complexType>
20+
</xs:schema>

‎autotest/ogr/data/gmlas/choice_int_inlined.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<l:main xmlns:l="http://example.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://example.com" xsi:schemaLocation="http://example.com choice_int_inlined.xsd">
3+
<l:a>
4+
<l:b int_attr="1"/>
5+
<l:b int_attr="2"/>
6+
</l:a>
7+
</l:main>

‎autotest/ogr/data/gmlas/choice_int_inlined.xsd

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xs:schema xmlns:l="http://example.com" targetNamespace="http://example.com" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
3+
<xs:element name="main" type="l:main" abstract="false">
4+
</xs:element>
5+
<xs:complexType name="main" abstract="false">
6+
<xs:sequence>
7+
<xs:element name="a" minOccurs="1" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:choice minOccurs="1" maxOccurs="unbounded">
10+
<xs:element ref="l:b"/>
11+
</xs:choice>
12+
</xs:complexType>
13+
</xs:element>
14+
</xs:sequence>
15+
</xs:complexType>
16+
<xs:element name="b" type="l:b" abstract="false"/>
17+
<xs:complexType name="b" abstract="false">
18+
<xs:attribute name="int_attr" type="xs:int" use="required"/>
19+
</xs:complexType>
20+
</xs:schema>

‎autotest/ogr/data/gmlas/choice_str_inlined.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<l:main xmlns:l="http://example.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://example.com" xsi:schemaLocation="http://example.com choice_str_inlined.xsd">
3+
<l:a>
4+
<l:b str_attr="val1"/>
5+
<l:b str_attr="val2"/>
6+
</l:a>
7+
</l:main>

‎autotest/ogr/data/gmlas/choice_str_inlined.xsd

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xs:schema xmlns:l="http://example.com" targetNamespace="http://example.com" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
3+
<xs:element name="main" type="l:main" abstract="false">
4+
</xs:element>
5+
<xs:complexType name="main" abstract="false">
6+
<xs:sequence>
7+
<xs:element name="a" minOccurs="1" maxOccurs="1">
8+
<xs:complexType>
9+
<xs:choice minOccurs="1" maxOccurs="unbounded">
10+
<xs:element ref="l:b"/>
11+
</xs:choice>
12+
</xs:complexType>
13+
</xs:element>
14+
</xs:sequence>
15+
</xs:complexType>
16+
<xs:element name="b" type="l:b" abstract="false"/>
17+
<xs:complexType name="b" abstract="false">
18+
<xs:attribute name="str_attr" type="xs:string" use="required"/>
19+
</xs:complexType>
20+
</xs:schema>

‎autotest/ogr/ogr_gmlas.py

+21
Original file line numberDiff line numberDiff line change
@@ -3484,3 +3484,24 @@ def test_ogr_gmlas_billion_laugh():
34843484
for lyr in ds:
34853485
for f in lyr:
34863486
pass
3487+
3488+
3489+
###############################################################################
3490+
# Test fix for https://github.com/OSGeo/gdal/issues/12027
3491+
3492+
3493+
@gdaltest.enable_exceptions()
3494+
@pytest.mark.parametrize(
3495+
"filename, attrname, value",
3496+
[
3497+
("data/gmlas/choice_str_inlined.xml", "a_b_str_attr", ["val1", "val2"]),
3498+
("data/gmlas/choice_int_inlined.xml", "a_b_int_attr", [1, 2]),
3499+
("data/gmlas/choice_int64_inlined.xml", "a_b_int64_attr", [123456789123, 2]),
3500+
("data/gmlas/choice_double_inlined.xml", "a_b_double_attr", [1.5, 2.5]),
3501+
],
3502+
)
3503+
def test_ogr_gmlas_choice_inlined(filename, attrname, value):
3504+
with gdal.OpenEx(f"GMLAS:{filename}") as ds:
3505+
lyr = ds.GetLayer(0)
3506+
f = lyr.GetNextFeature()
3507+
assert f[attrname] == value

‎ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp

+72-1
Original file line numberDiff line numberDiff line change
@@ -797,9 +797,80 @@ void GMLASReader::SetField(OGRFeature *poFeature, OGRGMLASLayer *poLayer,
797797
poFeature->SetField(nAttrIdx, papszTokens);
798798
CSLDestroy(papszTokens);
799799
}
800+
else if (eType == OFTStringList)
801+
{
802+
OGRField *psRawField = poFeature->GetRawFieldRef(nAttrIdx);
803+
if (OGR_RawField_IsUnset(psRawField))
804+
{
805+
poFeature->SetField(nAttrIdx, osAttrValue.c_str());
806+
}
807+
else
808+
{
809+
++psRawField->StringList.nCount;
810+
psRawField->StringList.paList = CSLAddString(
811+
psRawField->StringList.paList, osAttrValue.c_str());
812+
}
813+
}
814+
else if (eType == OFTIntegerList)
815+
{
816+
OGRField *psRawField = poFeature->GetRawFieldRef(nAttrIdx);
817+
if (OGR_RawField_IsUnset(psRawField))
818+
{
819+
psRawField->IntegerList.nCount = 1;
820+
psRawField->IntegerList.paList = static_cast<int *>(
821+
CPLMalloc(psRawField->IntegerList.nCount * sizeof(int)));
822+
}
823+
else
824+
{
825+
++psRawField->IntegerList.nCount;
826+
psRawField->IntegerList.paList = static_cast<int *>(
827+
CPLRealloc(psRawField->IntegerList.paList,
828+
psRawField->IntegerList.nCount * sizeof(int)));
829+
}
830+
psRawField->IntegerList.paList[psRawField->IntegerList.nCount - 1] =
831+
atoi(osAttrValue.c_str());
832+
}
833+
else if (eType == OFTInteger64List)
834+
{
835+
OGRField *psRawField = poFeature->GetRawFieldRef(nAttrIdx);
836+
if (OGR_RawField_IsUnset(psRawField))
837+
{
838+
psRawField->Integer64List.nCount = 1;
839+
psRawField->Integer64List.paList =
840+
static_cast<GIntBig *>(CPLMalloc(
841+
psRawField->Integer64List.nCount * sizeof(GIntBig)));
842+
}
843+
else
844+
{
845+
++psRawField->Integer64List.nCount;
846+
psRawField->Integer64List.paList =
847+
static_cast<GIntBig *>(CPLRealloc(
848+
psRawField->Integer64List.paList,
849+
psRawField->Integer64List.nCount * sizeof(GIntBig)));
850+
}
851+
psRawField->Integer64List
852+
.paList[psRawField->Integer64List.nCount - 1] =
853+
CPLAtoGIntBig(osAttrValue.c_str());
854+
}
800855
else
801856
{
802-
poFeature->SetField(nAttrIdx, osAttrValue.c_str());
857+
CPLAssert(eType == OFTRealList);
858+
OGRField *psRawField = poFeature->GetRawFieldRef(nAttrIdx);
859+
if (OGR_RawField_IsUnset(psRawField))
860+
{
861+
psRawField->RealList.nCount = 1;
862+
psRawField->RealList.paList = static_cast<double *>(
863+
CPLMalloc(psRawField->RealList.nCount * sizeof(double)));
864+
}
865+
else
866+
{
867+
++psRawField->RealList.nCount;
868+
psRawField->RealList.paList = static_cast<double *>(
869+
CPLRealloc(psRawField->RealList.paList,
870+
psRawField->RealList.nCount * sizeof(double)));
871+
}
872+
psRawField->RealList.paList[psRawField->RealList.nCount - 1] =
873+
CPLAtof(osAttrValue.c_str());
803874
}
804875
}
805876
else

0 commit comments

Comments
 (0)