From 4caf162e60028520c8ad103166930514197a8cf6 Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Fri, 3 May 2024 10:47:58 +0200
Subject: [PATCH 1/2] CII special ID handling fixed

---
 cii/schematron/CII/EN16931-CII-syntax.sch      | 7 ++++---
 cii/schematron/abstract/EN16931-CII-syntax.sch | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cii/schematron/CII/EN16931-CII-syntax.sch b/cii/schematron/CII/EN16931-CII-syntax.sch
index 3f9fbf6..57a7d48 100644
--- a/cii/schematron/CII/EN16931-CII-syntax.sch
+++ b/cii/schematron/CII/EN16931-CII-syntax.sch
@@ -779,9 +779,10 @@
 	<param name="Exchanged_Document" value="/rsm:CrossIndustryInvoice/rsm:ExchangedDocument"/>
 	<param name="Note_Exchanged_Document" value="/rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:IncludedNote"/>
 	<param name="IDTypeNoAttributes"
-		value="/rsm:CrossIndustryInvoice/*[self::rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID or
-        self::rsm:ExchangedDocument/ram:ID or self::rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:AssociatedDocumentLineDocument/ram:LineID or
-        self::rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:SellerAssignedID]"/>
+		value="/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID or
+           /rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:ID or 
+           /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:AssociatedDocumentLineDocument/ram:LineID or
+           /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:SellerAssignedID"/>
 	<param name="IDType" value="//ram:*[ends-with(name(), 'ID')]"/>
 	<param name="TypeCodeType" value="//ram:TypeCode"/>
 	<param name="NoAttributesTypeCodeType"
diff --git a/cii/schematron/abstract/EN16931-CII-syntax.sch b/cii/schematron/abstract/EN16931-CII-syntax.sch
index e18d673..df0ba68 100644
--- a/cii/schematron/abstract/EN16931-CII-syntax.sch
+++ b/cii/schematron/abstract/EN16931-CII-syntax.sch
@@ -540,6 +540,11 @@
 		<assert test="$CII-SR-005" flag="warning" id="CII-SR-05">[CII-SR-005] - SpecifiedDocumentVersion should not be present</assert>
 	</rule>
 	<rule context="$IDTypeNoAttributes">
+    <!-- Rules DT-001 to DT-004 need to be copied here to take effect -->
+    <assert test="$CII-DT-001" flag="fatal" id="CII-DT-001">[CII-DT-001] - schemeName should not be present</assert>
+    <assert test="$CII-DT-002" flag="fatal" id="CII-DT-002">[CII-DT-002] - schemeAgencyName should not be present</assert>
+    <assert test="$CII-DT-003" flag="fatal" id="CII-DT-003">[CII-DT-003] - schemeDataURI should not be present</assert>
+    <assert test="$CII-DT-004" flag="fatal" id="CII-DT-004">[CII-DT-004] - schemeURI should not be present</assert>
 		<assert test="$CII-DT-005" flag="fatal" id="CII-DT-005">[CII-DT-005] - schemeID should not be present</assert>
 		<assert test="$CII-DT-006" flag="fatal" id="CII-DT-006">[CII-DT-006] - schemeAgencyID should not be present</assert>
 		<assert test="$CII-DT-007" flag="fatal" id="CII-DT-007">[CII-DT-007] - schemeVersionID should not be present</assert>

From 97e86bcda1556a8149fc5433c4e5311332d73d2a Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Fri, 3 May 2024 10:58:18 +0200
Subject: [PATCH 2/2] Using | instead of or

---
 cii/schematron/CII/EN16931-CII-syntax.sch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cii/schematron/CII/EN16931-CII-syntax.sch b/cii/schematron/CII/EN16931-CII-syntax.sch
index 57a7d48..ba8aa02 100644
--- a/cii/schematron/CII/EN16931-CII-syntax.sch
+++ b/cii/schematron/CII/EN16931-CII-syntax.sch
@@ -779,9 +779,9 @@
 	<param name="Exchanged_Document" value="/rsm:CrossIndustryInvoice/rsm:ExchangedDocument"/>
 	<param name="Note_Exchanged_Document" value="/rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:IncludedNote"/>
 	<param name="IDTypeNoAttributes"
-		value="/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID or
-           /rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:ID or 
-           /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:AssociatedDocumentLineDocument/ram:LineID or
+		value="/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID |
+           /rsm:CrossIndustryInvoice/rsm:ExchangedDocument/ram:ID |
+           /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:AssociatedDocumentLineDocument/ram:LineID |
            /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:IncludedSupplyChainTradeLineItem/ram:SpecifiedTradeProduct/ram:SellerAssignedID"/>
 	<param name="IDType" value="//ram:*[ends-with(name(), 'ID')]"/>
 	<param name="TypeCodeType" value="//ram:TypeCode"/>