Merge pull request #36 from OP-TED/develop

Changed mapping for NOTICE_NUMBER_OJ to always map to OPP-090
OP-TED · Oct 10, 2024 · c4731a1 · c4731a1
2 parents 6cf90ae + 73b700c
commit c4731a1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,12 @@
 
-# TED XML Data Converter 1.0.3 Release Notes
+# TED XML Data Converter 1.0.4 Release Notes
 
-This is a bugfix release of the TED XML Data Converter. Some cosmetic changes are not listed below.
+This is a minor release of the TED XML Data Converter. Some cosmetic changes are not listed below.
 
-## Bug fixes
+## Changes
 
-* Fatal error in "lot-results" template
-* Improved link between LotResult and Lot
-
-## Mapping changes
-
-* Mapped from EEIG to eForms subtype X01
+* Changed fatal error message output for F14 notices
+* Changed mapping for NOTICE_NUMBER_OJ to always map to OPP-090
 
 ## Notes
 This release of the TED XML Data Converter can convert notices published in the R2.0.9 TED schema, versions S01 to S05. It is not able to convert notices published in the R2.0.8 schema, or notices published under the 1370/2007 ("Transport") Regulation.

diff --git a/development-notices/eforms-xml/20-156983-001-EXP.xml b/development-notices/eforms-xml/20-156983-001-EXP.xml
@@ -358,6 +358,9 @@
       <!--Lots All Required (BT-763)-->
       <!--PIN Competition Termination (BT-756)-->
       <!--Previous Notice Identifier (OPP-090)-->
+      <cac:NoticeDocumentReference>
+         <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
+      </cac:NoticeDocumentReference>
       <!--Direct Award Justification (BT-136)-->
       <!--Direct Award Justification (BT-135)-->
       <!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -574,9 +577,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->
@@ -869,9 +869,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->
@@ -1164,9 +1161,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->
@@ -1459,9 +1453,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->
@@ -1754,9 +1745,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->
@@ -2049,9 +2037,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->
@@ -2338,9 +2323,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->

diff --git a/development-notices/eforms-xml/20-343258-001-EXP.xml b/development-notices/eforms-xml/20-343258-001-EXP.xml
@@ -227,6 +227,9 @@
       <!--Lots All Required (BT-763)-->
       <!--PIN Competition Termination (BT-756)-->
       <!--Previous Notice Identifier (OPP-090)-->
+      <cac:NoticeDocumentReference>
+         <cbc:ID schemeName="ojs-notice-id">00215923-2020</cbc:ID>
+      </cac:NoticeDocumentReference>
       <!--Direct Award Justification (BT-136)-->
       <!--Direct Award Justification (BT-135)-->
       <!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -661,9 +664,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00215923-2020</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->

diff --git a/development-notices/eforms-xml/20-587026-001-EXP.xml b/development-notices/eforms-xml/20-587026-001-EXP.xml
@@ -395,6 +395,9 @@
       <!--Lots All Required (BT-763)-->
       <!--PIN Competition Termination (BT-756)-->
       <!--Previous Notice Identifier (OPP-090)-->
+      <cac:NoticeDocumentReference>
+         <cbc:ID schemeName="ojs-notice-id">00448857-2020</cbc:ID>
+      </cac:NoticeDocumentReference>
       <!--Direct Award Justification (BT-136)-->
       <!--Direct Award Justification (BT-135)-->
       <!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -677,9 +680,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00448857-2020</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->

diff --git a/development-notices/eforms-xml/21-077815-001-EXP.xml b/development-notices/eforms-xml/21-077815-001-EXP.xml
@@ -293,6 +293,9 @@
       <!--Lots All Required (BT-763)-->
       <!--PIN Competition Termination (BT-756)-->
       <!--Previous Notice Identifier (OPP-090)-->
+      <cac:NoticeDocumentReference>
+         <cbc:ID schemeName="ojs-notice-id">00542947-2020</cbc:ID>
+      </cac:NoticeDocumentReference>
       <!--Direct Award Justification (BT-136)-->
       <!--Direct Award Justification (BT-135)-->
       <!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -670,9 +673,6 @@
          <!--Deadline Receipt Requests (BT-1311)-->
          <!--Additional Information Deadline (BT-13)-->
          <!--Previous Planning Identifier (BT-125)-->
-         <cac:NoticeDocumentReference>
-            <cbc:ID schemeName="ojs-notice-id">00542947-2020</cbc:ID>
-         </cac:NoticeDocumentReference>
          <!--Submission Nonelectronic Justification (BT-19)-->
          <!--Submission Nonelectronic Description (BT-745)-->
          <!--Maximum Candidates Indicator (BT-661)-->

diff --git a/xslt/functions-and-data.xslt b/xslt/functions-and-data.xslt
@@ -266,7 +266,7 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted ted-1 ted-2 gc n20
 		<!-- exit with an error if the form name is F14 -->
 		<xsl:when test="$ted-form-name eq 'F14'">
 			<xsl:message terminate="yes">
-				<xsl:text>ERROR: F14 (Corrigendum) notices cannot be converted</xsl:text><xsl:value-of select="$newline"/>
+				<xsl:text>ERROR: F14 notices cannot be converted. You may wish to convert the original notice, but please ensure all changes reported in subsequent F14 notices are included.</xsl:text><xsl:value-of select="$newline"/>
 				<xsl:value-of select="$common-message"/>
 			</xsl:message>
 		</xsl:when>

diff --git a/xslt/lot.xslt b/xslt/lot.xslt
@@ -669,11 +669,8 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted gc n2016 n2021 pin
 		<!-- Additional Information Deadline (BT-13): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->
 		<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Additional Information Deadline (BT-13)'"/></xsl:call-template>
 		<!-- Previous Planning Identifier (BT-125): eForms documentation cardinality (Lot) = ? | Forbidden for PIN subtypes 1-3 and E1, CM subtypes 38-40 and E5; Optional for other subtypes -->
-		<!-- NOTICE_NUMBER_OJ maps to BT-125 only for Competition notices; for other notices, it maps to OPP-090 -->
+		<!-- NOTICE_NUMBER_OJ maps to OPP-090  as it is possible for a Competition notice to have a previous notice that is not of type PIN -->
 		<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Previous Planning Identifier (BT-125)'"/></xsl:call-template>
-		<xsl:if test="$eforms-form-type = 'competition'">
-			<xsl:apply-templates select="../../*:PROCEDURE/*:NOTICE_NUMBER_OJ"/>
-		</xsl:if>
 		<!-- Submission Nonelectronic Justification (BT-19): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->
 		<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Submission Nonelectronic Justification (BT-19)'"/></xsl:call-template>
 		<!-- Submission Nonelectronic Description (BT-745): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->

diff --git a/xslt/ted-to-eforms.xslt b/xslt/ted-to-eforms.xslt
@@ -336,9 +336,7 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted ted-1 ted-2 gc n20
 
 		<!-- Previous Notice Identifier (OPP-090): Used for linking notices where no other linking mechanism is available -->
 		<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Previous Notice Identifier (OPP-090)'"/></xsl:call-template>
-		<xsl:if test="$eforms-form-type != 'competition'">
-			<xsl:apply-templates select="*:PROCEDURE/*:NOTICE_NUMBER_OJ"/>
-		</xsl:if>
+		<xsl:apply-templates select="*:PROCEDURE/*:NOTICE_NUMBER_OJ"/>
 		<!-- Procedure Accelerated (BT-106): eForms documentation cardinality (Procedure) = ? | Optional for CN subtypes 16-18 and E3, CAN subtypes 29-31 and E4, CM subtype E5; Forbidden for other subtypes -->
 		<!-- Procedure Accelerated Justification (BT-1351): eForms documentation cardinality (Procedure) = ? | Optional for CN subtypes 16-18 and E3, CAN subtypes 29-31 and E4, CM subtype E5; Forbidden for other subtypes -->
 		<xsl:apply-templates select="*:PROCEDURE/*:ACCELERATED_PROC"/>