From 2ca5376a79db86c2b3a1200490fae68d1f0ee2ae Mon Sep 17 00:00:00 2001
From: Pascaline Laure Tchienehom <pascalinelaure.tchienehom@nttdata.com>
Date: Mon, 24 Jul 2023 18:10:34 +0200
Subject: [PATCH] Fix TEDSPD-583 Validation, Fix TEDSPD-569 #387 complement
 listVersionID

Fix TEDSPD-583 Validation, Fix TEDSPD-569 #387 complement listVersionID
"./common/sch/04-ESPD-common-other-br.sch"
---
 validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl  | 2 +-
 validation/ESPDRequest/xsl/04-ESPD-common-other-br.xsl       | 4 ++--
 validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl | 2 +-
 validation/ESPDResponse/xsl/04-ESPD-common-other-br.xsl      | 4 ++--
 validation/common/sch/01-ESPD-common-cl-attributes.sch       | 2 +-
 validation/common/sch/04-ESPD-common-other-br.sch            | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl b/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl
index 59caf5bd..462dced7 100644
--- a/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl
+++ b/validation/ESPDRequest/xsl/01-ESPD-common-cl-attributes.xsl
@@ -295,7 +295,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listURI = http://publications.europa.eu/resource/authority/access-right'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listURI = http://publications.europa.eu/resource/dataset/access-right'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
diff --git a/validation/ESPDRequest/xsl/04-ESPD-common-other-br.xsl b/validation/ESPDRequest/xsl/04-ESPD-common-other-br.xsl
index 9ec62077..6b13e6f2 100644
--- a/validation/ESPDRequest/xsl/04-ESPD-common-other-br.xsl
+++ b/validation/ESPDRequest/xsl/04-ESPD-common-other-br.xsl
@@ -300,7 +300,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-<xsl:template match="cbc:ExpectedCode | cbc:IdentificationCode | cbc:ValueCurrencyCode | cbc:ProcedureCode | cbc:ProcurementTypeCode | cbc:ProcurementSubTypeCode"
+<xsl:template match="cbc:ExpectedCode | cbc:IdentificationCode | cbc:DocumentTypeCode | cbc:ValueCurrencyCode | cbc:ProcedureCode | cbc:ProcurementTypeCode | cbc:ProcurementSubTypeCode"
                  priority="1003"
                  mode="M7">
 
@@ -358,7 +358,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-<xsl:template match="cbc:TypeCode | cbc:DocumentTypeCode | cbc:PropertyGroupTypeCode | cbc:ValueDataTypeCode"
+<xsl:template match="cbc:TypeCode | cbc:PropertyGroupTypeCode | cbc:ValueDataTypeCode"
                  priority="1002"
                  mode="M7">
 
diff --git a/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl b/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl
index 59caf5bd..462dced7 100644
--- a/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl
+++ b/validation/ESPDResponse/xsl/01-ESPD-common-cl-attributes.xsl
@@ -295,7 +295,7 @@
                   <xsl:value-of select="name(ancestor::*[1])"/>
                   <xsl:text/>/<xsl:text/>
                   <xsl:value-of select="name()"/>
-                  <xsl:text/>' must have the following attribute and value: 'listURI = http://publications.europa.eu/resource/authority/access-right'.</svrl:text>
+                  <xsl:text/>' must have the following attribute and value: 'listURI = http://publications.europa.eu/resource/dataset/access-right'.</svrl:text>
             </svrl:failed-assert>
          </xsl:otherwise>
       </xsl:choose>
diff --git a/validation/ESPDResponse/xsl/04-ESPD-common-other-br.xsl b/validation/ESPDResponse/xsl/04-ESPD-common-other-br.xsl
index 9ec62077..6b13e6f2 100644
--- a/validation/ESPDResponse/xsl/04-ESPD-common-other-br.xsl
+++ b/validation/ESPDResponse/xsl/04-ESPD-common-other-br.xsl
@@ -300,7 +300,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-<xsl:template match="cbc:ExpectedCode | cbc:IdentificationCode | cbc:ValueCurrencyCode | cbc:ProcedureCode | cbc:ProcurementTypeCode | cbc:ProcurementSubTypeCode"
+<xsl:template match="cbc:ExpectedCode | cbc:IdentificationCode | cbc:DocumentTypeCode | cbc:ValueCurrencyCode | cbc:ProcedureCode | cbc:ProcurementTypeCode | cbc:ProcurementSubTypeCode"
                  priority="1003"
                  mode="M7">
 
@@ -358,7 +358,7 @@
    </xsl:template>
 
 	  <!--RULE -->
-<xsl:template match="cbc:TypeCode | cbc:DocumentTypeCode | cbc:PropertyGroupTypeCode | cbc:ValueDataTypeCode"
+<xsl:template match="cbc:TypeCode | cbc:PropertyGroupTypeCode | cbc:ValueDataTypeCode"
                  priority="1002"
                  mode="M7">
 
diff --git a/validation/common/sch/01-ESPD-common-cl-attributes.sch b/validation/common/sch/01-ESPD-common-cl-attributes.sch
index 14f9b71a..319d6be9 100644
--- a/validation/common/sch/01-ESPD-common-cl-attributes.sch
+++ b/validation/common/sch/01-ESPD-common-cl-attributes.sch
@@ -21,7 +21,7 @@
             <assert test="(false() or not(@listID != 'http://publications.europa.eu/resource/authority/access-right'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listID = http://publications.europa.eu/resource/authority/access-right'.</assert>
             <assert test="(false() or not(@listVersionID != '20220316-0'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listVersionID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listVersionID = 20220316-0'.</assert>
             <assert test="(false() or not(@listSchemeURI != 'http://publications.europa.eu/resource/distribution/access-right/20220316-0/xml/gc/AccessRight.gc'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listSchemeURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listSchemeURI = http://publications.europa.eu/resource/distribution/access-right/20220316-0/xml/gc/AccessRight.gc'.</assert>
-            <assert test="(false() or not(@listURI != 'http://publications.europa.eu/resource/dataset/access-right'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listURI = http://publications.europa.eu/resource/authority/access-right'.</assert>
+            <assert test="(false() or not(@listURI != 'http://publications.europa.eu/resource/dataset/access-right'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listURI"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listURI = http://publications.europa.eu/resource/dataset/access-right'.</assert>
             <assert test="(false() or not(@listAgencyName != 'Publications Office of the European Union'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listAgencyName"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listAgencyName = Publications Office of the European Union'.</assert>
             <assert test="(false() or not(@listAgencyID != 'OP'))" flag="fatal">Invalid codelist attribute value '<value-of select="@listAgencyID"/>'. The element '<value-of select="name(ancestor::*[1])"/>/<value-of select="name()"/>' must have the following attribute and value: 'listAgencyID = OP'.</assert>
         </rule>
diff --git a/validation/common/sch/04-ESPD-common-other-br.sch b/validation/common/sch/04-ESPD-common-other-br.sch
index edeabc09..61fbc108 100644
--- a/validation/common/sch/04-ESPD-common-other-br.sch
+++ b/validation/common/sch/04-ESPD-common-other-br.sch
@@ -36,14 +36,14 @@
 		</rule>
 		
 		<!-- BR-OTH-01: For codes, this ESPD V03.00.01 specification requires always three mandatory attributes: listID, listAgencyID, and listVersionID. -->
-		<rule context="cbc:ExpectedCode | cbc:IdentificationCode | cbc:ValueCurrencyCode | cbc:ProcedureCode | cbc:ProcurementTypeCode | cbc:ProcurementSubTypeCode">
+		<rule context="cbc:ExpectedCode | cbc:IdentificationCode | cbc:DocumentTypeCode | cbc:ValueCurrencyCode | cbc:ProcedureCode | cbc:ProcurementTypeCode | cbc:ProcurementSubTypeCode">
 			<assert test="@listID" flag="fatal" id="BR-OTH-01-10">The attribute listID is mandatory for the element: '<value-of select="name()"/>').</assert>
 			<assert test="@listAgencyID" flag="fatal" id="BR-OTH-01-20">The attribute listAgencyID is mandatory for the element: '<value-of select="name()"/>').</assert>
 			<assert test="@listVersionID" flag="fatal"  id="BR-OTH-01-30">The attribute listVersionID is mandatory for the element: '<value-of select="name()"/>').</assert>
 		</rule>
 		
 		<!-- BR-OTH-01: Code types listVersionID validation: starts with 3. -->
-		<rule context="cbc:TypeCode | cbc:DocumentTypeCode | cbc:PropertyGroupTypeCode | cbc:ValueDataTypeCode">
+		<rule context="cbc:TypeCode | cbc:PropertyGroupTypeCode | cbc:ValueDataTypeCode">
 			<assert test="@listID" flag="fatal" id="BR-OTH-01-11">The attribute listID is mandatory for the element: '<value-of select="name()"/>').</assert>
 			<assert test="@listAgencyID" flag="fatal" id="BR-OTH-01-21">The attribute listAgencyID is mandatory for the element: '<value-of select="name()"/>').</assert>
 			<assert test="@listVersionID" flag="fatal" id="BR-OTH-01-31">The attribute listVersionID is mandatory for the element: '<value-of select="name()"/>').</assert>