Skip to content

Commit 73b700c

Browse files
pdonohoepdonohoe
committed
Changed mapping for NOTICE_NUMBER_OJ to always map to OPP-090
1 parent 5a9b47b commit 73b700c

File tree

8 files changed

+20
-47
lines changed

8 files changed

+20
-47
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11

2-
# TED XML Data Converter 1.0.3 Release Notes
2+
# TED XML Data Converter 1.0.4 Release Notes
33

4-
This is a bugfix release of the TED XML Data Converter. Some cosmetic changes are not listed below.
4+
This is a minor release of the TED XML Data Converter. Some cosmetic changes are not listed below.
55

6-
## Bug fixes
6+
## Changes
77

8-
* Fatal error in "lot-results" template
9-
* Improved link between LotResult and Lot
10-
11-
## Mapping changes
12-
13-
* Mapped from EEIG to eForms subtype X01
8+
* Changed fatal error message output for F14 notices
9+
* Changed mapping for NOTICE_NUMBER_OJ to always map to OPP-090
1410

1511
## Notes
1612
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.

‎development-notices/eforms-xml/20-156983-001-EXP.xml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,9 @@
358358
<!--Lots All Required (BT-763)-->
359359
<!--PIN Competition Termination (BT-756)-->
360360
<!--Previous Notice Identifier (OPP-090)-->
361+
<cac:NoticeDocumentReference>
362+
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
363+
</cac:NoticeDocumentReference>
361364
<!--Direct Award Justification (BT-136)-->
362365
<!--Direct Award Justification (BT-135)-->
363366
<!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -574,9 +577,6 @@
574577
<!--Deadline Receipt Requests (BT-1311)-->
575578
<!--Additional Information Deadline (BT-13)-->
576579
<!--Previous Planning Identifier (BT-125)-->
577-
<cac:NoticeDocumentReference>
578-
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
579-
</cac:NoticeDocumentReference>
580580
<!--Submission Nonelectronic Justification (BT-19)-->
581581
<!--Submission Nonelectronic Description (BT-745)-->
582582
<!--Maximum Candidates Indicator (BT-661)-->
@@ -869,9 +869,6 @@
869869
<!--Deadline Receipt Requests (BT-1311)-->
870870
<!--Additional Information Deadline (BT-13)-->
871871
<!--Previous Planning Identifier (BT-125)-->
872-
<cac:NoticeDocumentReference>
873-
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
874-
</cac:NoticeDocumentReference>
875872
<!--Submission Nonelectronic Justification (BT-19)-->
876873
<!--Submission Nonelectronic Description (BT-745)-->
877874
<!--Maximum Candidates Indicator (BT-661)-->
@@ -1164,9 +1161,6 @@
11641161
<!--Deadline Receipt Requests (BT-1311)-->
11651162
<!--Additional Information Deadline (BT-13)-->
11661163
<!--Previous Planning Identifier (BT-125)-->
1167-
<cac:NoticeDocumentReference>
1168-
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
1169-
</cac:NoticeDocumentReference>
11701164
<!--Submission Nonelectronic Justification (BT-19)-->
11711165
<!--Submission Nonelectronic Description (BT-745)-->
11721166
<!--Maximum Candidates Indicator (BT-661)-->
@@ -1459,9 +1453,6 @@
14591453
<!--Deadline Receipt Requests (BT-1311)-->
14601454
<!--Additional Information Deadline (BT-13)-->
14611455
<!--Previous Planning Identifier (BT-125)-->
1462-
<cac:NoticeDocumentReference>
1463-
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
1464-
</cac:NoticeDocumentReference>
14651456
<!--Submission Nonelectronic Justification (BT-19)-->
14661457
<!--Submission Nonelectronic Description (BT-745)-->
14671458
<!--Maximum Candidates Indicator (BT-661)-->
@@ -1754,9 +1745,6 @@
17541745
<!--Deadline Receipt Requests (BT-1311)-->
17551746
<!--Additional Information Deadline (BT-13)-->
17561747
<!--Previous Planning Identifier (BT-125)-->
1757-
<cac:NoticeDocumentReference>
1758-
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
1759-
</cac:NoticeDocumentReference>
17601748
<!--Submission Nonelectronic Justification (BT-19)-->
17611749
<!--Submission Nonelectronic Description (BT-745)-->
17621750
<!--Maximum Candidates Indicator (BT-661)-->
@@ -2049,9 +2037,6 @@
20492037
<!--Deadline Receipt Requests (BT-1311)-->
20502038
<!--Additional Information Deadline (BT-13)-->
20512039
<!--Previous Planning Identifier (BT-125)-->
2052-
<cac:NoticeDocumentReference>
2053-
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
2054-
</cac:NoticeDocumentReference>
20552040
<!--Submission Nonelectronic Justification (BT-19)-->
20562041
<!--Submission Nonelectronic Description (BT-745)-->
20572042
<!--Maximum Candidates Indicator (BT-661)-->
@@ -2338,9 +2323,6 @@
23382323
<!--Deadline Receipt Requests (BT-1311)-->
23392324
<!--Additional Information Deadline (BT-13)-->
23402325
<!--Previous Planning Identifier (BT-125)-->
2341-
<cac:NoticeDocumentReference>
2342-
<cbc:ID schemeName="ojs-notice-id">00214462-2019</cbc:ID>
2343-
</cac:NoticeDocumentReference>
23442326
<!--Submission Nonelectronic Justification (BT-19)-->
23452327
<!--Submission Nonelectronic Description (BT-745)-->
23462328
<!--Maximum Candidates Indicator (BT-661)-->

‎development-notices/eforms-xml/20-343258-001-EXP.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@
227227
<!--Lots All Required (BT-763)-->
228228
<!--PIN Competition Termination (BT-756)-->
229229
<!--Previous Notice Identifier (OPP-090)-->
230+
<cac:NoticeDocumentReference>
231+
<cbc:ID schemeName="ojs-notice-id">00215923-2020</cbc:ID>
232+
</cac:NoticeDocumentReference>
230233
<!--Direct Award Justification (BT-136)-->
231234
<!--Direct Award Justification (BT-135)-->
232235
<!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -661,9 +664,6 @@
661664
<!--Deadline Receipt Requests (BT-1311)-->
662665
<!--Additional Information Deadline (BT-13)-->
663666
<!--Previous Planning Identifier (BT-125)-->
664-
<cac:NoticeDocumentReference>
665-
<cbc:ID schemeName="ojs-notice-id">00215923-2020</cbc:ID>
666-
</cac:NoticeDocumentReference>
667667
<!--Submission Nonelectronic Justification (BT-19)-->
668668
<!--Submission Nonelectronic Description (BT-745)-->
669669
<!--Maximum Candidates Indicator (BT-661)-->

‎development-notices/eforms-xml/20-587026-001-EXP.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@
395395
<!--Lots All Required (BT-763)-->
396396
<!--PIN Competition Termination (BT-756)-->
397397
<!--Previous Notice Identifier (OPP-090)-->
398+
<cac:NoticeDocumentReference>
399+
<cbc:ID schemeName="ojs-notice-id">00448857-2020</cbc:ID>
400+
</cac:NoticeDocumentReference>
398401
<!--Direct Award Justification (BT-136)-->
399402
<!--Direct Award Justification (BT-135)-->
400403
<!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -677,9 +680,6 @@
677680
<!--Deadline Receipt Requests (BT-1311)-->
678681
<!--Additional Information Deadline (BT-13)-->
679682
<!--Previous Planning Identifier (BT-125)-->
680-
<cac:NoticeDocumentReference>
681-
<cbc:ID schemeName="ojs-notice-id">00448857-2020</cbc:ID>
682-
</cac:NoticeDocumentReference>
683683
<!--Submission Nonelectronic Justification (BT-19)-->
684684
<!--Submission Nonelectronic Description (BT-745)-->
685685
<!--Maximum Candidates Indicator (BT-661)-->

‎development-notices/eforms-xml/21-077815-001-EXP.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,9 @@
293293
<!--Lots All Required (BT-763)-->
294294
<!--PIN Competition Termination (BT-756)-->
295295
<!--Previous Notice Identifier (OPP-090)-->
296+
<cac:NoticeDocumentReference>
297+
<cbc:ID schemeName="ojs-notice-id">00542947-2020</cbc:ID>
298+
</cac:NoticeDocumentReference>
296299
<!--Direct Award Justification (BT-136)-->
297300
<!--Direct Award Justification (BT-135)-->
298301
<!--Direct Award Justification Previous Procedure Identifier (BT-1252)-->
@@ -670,9 +673,6 @@
670673
<!--Deadline Receipt Requests (BT-1311)-->
671674
<!--Additional Information Deadline (BT-13)-->
672675
<!--Previous Planning Identifier (BT-125)-->
673-
<cac:NoticeDocumentReference>
674-
<cbc:ID schemeName="ojs-notice-id">00542947-2020</cbc:ID>
675-
</cac:NoticeDocumentReference>
676676
<!--Submission Nonelectronic Justification (BT-19)-->
677677
<!--Submission Nonelectronic Description (BT-745)-->
678678
<!--Maximum Candidates Indicator (BT-661)-->

‎xslt/functions-and-data.xslt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted ted-1 ted-2 gc n20
266266
<!-- exit with an error if the form name is F14 -->
267267
<xsl:when test="$ted-form-name eq 'F14'">
268268
<xsl:message terminate="yes">
269-
<xsl:text>ERROR: F14 (Corrigendum) notices cannot be converted</xsl:text><xsl:value-of select="$newline"/>
269+
<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"/>
270270
<xsl:value-of select="$common-message"/>
271271
</xsl:message>
272272
</xsl:when>

‎xslt/lot.xslt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -669,11 +669,8 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted gc n2016 n2021 pin
669669
<!-- Additional Information Deadline (BT-13): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->
670670
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Additional Information Deadline (BT-13)'"/></xsl:call-template>
671671
<!-- 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 -->
672-
<!-- NOTICE_NUMBER_OJ maps to BT-125 only for Competition notices; for other notices, it maps to OPP-090 -->
672+
<!-- 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 -->
673673
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Previous Planning Identifier (BT-125)'"/></xsl:call-template>
674-
<xsl:if test="$eforms-form-type = 'competition'">
675-
<xsl:apply-templates select="../../*:PROCEDURE/*:NOTICE_NUMBER_OJ"/>
676-
</xsl:if>
677674
<!-- Submission Nonelectronic Justification (BT-19): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->
678675
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Submission Nonelectronic Justification (BT-19)'"/></xsl:call-template>
679676
<!-- Submission Nonelectronic Description (BT-745): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->

‎xslt/ted-to-eforms.xslt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,7 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted ted-1 ted-2 gc n20
336336

337337
<!-- Previous Notice Identifier (OPP-090): Used for linking notices where no other linking mechanism is available -->
338338
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Previous Notice Identifier (OPP-090)'"/></xsl:call-template>
339-
<xsl:if test="$eforms-form-type != 'competition'">
340-
<xsl:apply-templates select="*:PROCEDURE/*:NOTICE_NUMBER_OJ"/>
341-
</xsl:if>
339+
<xsl:apply-templates select="*:PROCEDURE/*:NOTICE_NUMBER_OJ"/>
342340
<!-- 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 -->
343341
<!-- 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 -->
344342
<xsl:apply-templates select="*:PROCEDURE/*:ACCELERATED_PROC"/>

0 commit comments

Comments
 (0)