Skip to content

Commit 3d081a4

Browse files
jan-cernyjan-cerny
committed
Resolve parsing issues with OVAL 5.11.2 schemas
Similar to 8ba6231 but for OVAL 5.11.2. The missing namespace imports have already been fixed in 32d4d9b. Addressing: ``` File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1446: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1459: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1472: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1485: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1652: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1665: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1678: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. File '/root/openscap/schemas/oval/5.11.2/oval-definitions-schema.xsd' line 1691: local union type: A type, derived by list or union, must have the simple ur-type definition as base type, not '{http://oval.mitre.org/XMLSchema/oval-definitions-5}(NULL)'. OpenSCAP Error: Could not parse XML schema [validate.c:113] ```
1 parent 6363562 commit 3d081a4

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎schemas/oval/5.11.2/oval-definitions-schema.xsd

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@
14501450
<xsd:simpleContent>
14511451
<xsd:restriction base="oval-def:EntitySimpleBaseType">
14521452
<xsd:simpleType>
1453-
<xsd:union memberTypes="xsd:hexBinary oval:EmptyStringType"/>
1453+
<xsd:restriction base="xsd:string"/>
14541454
</xsd:simpleType>
14551455
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="binary"/>
14561456
</xsd:restriction>
@@ -1463,7 +1463,7 @@
14631463
<xsd:simpleContent>
14641464
<xsd:restriction base="oval-def:EntitySimpleBaseType">
14651465
<xsd:simpleType>
1466-
<xsd:union memberTypes="xsd:boolean oval:EmptyStringType"/>
1466+
<xsd:restriction base="xsd:string"/>
14671467
</xsd:simpleType>
14681468
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="boolean"/>
14691469
</xsd:restriction>
@@ -1476,7 +1476,7 @@
14761476
<xsd:simpleContent>
14771477
<xsd:restriction base="oval-def:EntitySimpleBaseType">
14781478
<xsd:simpleType>
1479-
<xsd:union memberTypes="xsd:float oval:EmptyStringType"/>
1479+
<xsd:restriction base="xsd:string"/>
14801480
</xsd:simpleType>
14811481
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="float"/>
14821482
</xsd:restriction>
@@ -1489,7 +1489,7 @@
14891489
<xsd:simpleContent>
14901490
<xsd:restriction base="oval-def:EntitySimpleBaseType">
14911491
<xsd:simpleType>
1492-
<xsd:union memberTypes="xsd:integer oval:EmptyStringType"/>
1492+
<xsd:restriction base="xsd:string"/>
14931493
</xsd:simpleType>
14941494
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="int"/>
14951495
</xsd:restriction>
@@ -1656,7 +1656,7 @@
16561656
<xsd:simpleContent>
16571657
<xsd:restriction base="oval-def:EntityStateSimpleBaseType">
16581658
<xsd:simpleType>
1659-
<xsd:union memberTypes="xsd:hexBinary oval:EmptyStringType"/>
1659+
<xsd:restriction base="xsd:string"/>
16601660
</xsd:simpleType>
16611661
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="binary"/>
16621662
</xsd:restriction>
@@ -1669,7 +1669,7 @@
16691669
<xsd:simpleContent>
16701670
<xsd:restriction base="oval-def:EntityStateSimpleBaseType">
16711671
<xsd:simpleType>
1672-
<xsd:union memberTypes="xsd:boolean oval:EmptyStringType"/>
1672+
<xsd:restriction base="xsd:string"/>
16731673
</xsd:simpleType>
16741674
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="boolean"/>
16751675
</xsd:restriction>
@@ -1682,7 +1682,7 @@
16821682
<xsd:simpleContent>
16831683
<xsd:restriction base="oval-def:EntityStateSimpleBaseType">
16841684
<xsd:simpleType>
1685-
<xsd:union memberTypes="xsd:float oval:EmptyStringType"/>
1685+
<xsd:restriction base="xsd:string"/>
16861686
</xsd:simpleType>
16871687
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="float"/>
16881688
</xsd:restriction>
@@ -1695,7 +1695,7 @@
16951695
<xsd:simpleContent>
16961696
<xsd:restriction base="oval-def:EntityStateSimpleBaseType">
16971697
<xsd:simpleType>
1698-
<xsd:union memberTypes="xsd:integer oval:EmptyStringType"/>
1698+
<xsd:restriction base="xsd:string"/>
16991699
</xsd:simpleType>
17001700
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="int"/>
17011701
</xsd:restriction>

‎schemas/oval/5.11.2/oval-system-characteristics-schema.xsd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
<xsd:simpleContent>
494494
<xsd:restriction base="oval-sc:EntityItemSimpleBaseType">
495495
<xsd:simpleType>
496-
<xsd:union memberTypes="xsd:hexBinary oval:EmptyStringType"/>
496+
<xsd:restriction base="xsd:string"/>
497497
</xsd:simpleType>
498498
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="binary"/>
499499
</xsd:restriction>
@@ -506,7 +506,7 @@
506506
<xsd:simpleContent>
507507
<xsd:restriction base="oval-sc:EntityItemSimpleBaseType">
508508
<xsd:simpleType>
509-
<xsd:union memberTypes="xsd:boolean oval:EmptyStringType"/>
509+
<xsd:restriction base="xsd:string"/>
510510
</xsd:simpleType>
511511
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="boolean"/>
512512
</xsd:restriction>
@@ -519,7 +519,7 @@
519519
<xsd:simpleContent>
520520
<xsd:restriction base="oval-sc:EntityItemSimpleBaseType">
521521
<xsd:simpleType>
522-
<xsd:union memberTypes="xsd:float oval:EmptyStringType"/>
522+
<xsd:restriction base="xsd:string"/>
523523
</xsd:simpleType>
524524
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="float"/>
525525
</xsd:restriction>
@@ -532,7 +532,7 @@
532532
<xsd:simpleContent>
533533
<xsd:restriction base="oval-sc:EntityItemSimpleBaseType">
534534
<xsd:simpleType>
535-
<xsd:union memberTypes="xsd:integer oval:EmptyStringType"/>
535+
<xsd:restriction base="xsd:string"/>
536536
</xsd:simpleType>
537537
<xsd:attribute name="datatype" type="oval:SimpleDatatypeEnumeration" use="required" fixed="int"/>
538538
</xsd:restriction>

0 commit comments

Comments
 (0)