Skip to content

Commit

Permalink
Merge pull request #32 from OP-TED/develop
Browse files Browse the repository at this point in the history 
Prepare version 1.0.3
  • Loading branch information
@pdonohoe
pdonohoe authored Apr 30, 2024
2 parents 6e97178 + 415ad3d commit 49cceb8
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 129 deletions.
22 changes: 5 additions & 17 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,17 @@

# TED XML Data Converter 1.0.2 Release Notes
# TED XML Data Converter 1.0.3 Release Notes

This is a bugfix release of the TED XML Data Converter.

## SDK version
* Updated version of converted eForms notices to SDK-1.10
This is a bugfix release of the TED XML Data Converter. Some cosmetic changes are not listed below.

## Bug fixes

* Fixed invalid Purpose Lot Identifier (BT-137) when LOT_NO is not a number
* Notice Publication Identifier (OPP-010): replaced hard-coded value with value from TED_EXPORT/@DOC_ID
* Contract Conclusion Date (BT-145): only output first date found when different dates were found in DATE_CONCLUSION_CONTRACT sharing the same CONTRACT_NO
* Fixed invalid eForms generation of Award Criterion Number (BT-541) efbc:ParameterNumeric from text in AC_WEIGHTING
* Fixed invalid order of Concession Revenue User (BT-162) efbc:RevenueUserAmount and Concession Revenue Buyer (BT-160) efbc:RevenueBuyerAmount
* Changed content of Framework Maximum Participants Number (BT-113) cbc:MaximumOperatorQuantity to "1" when no value is found in the TED XML
* Moved Participant Name (BT-47) from cac:ProcurementProject to cac:TenderingTerms
* Subtype 36: included Contract IDs in LotResults
* Improved detection of Lots referenced from AWARD_CONTRACT
* Created separate contracts for AWARD_CONTRACT elements which do not contain CONTRACT_NO.
* Fatal error in "lot-results" template

## Mapping changes

* Mapped from EEIG to eForms subtype X01

## 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.

It is not possible to convert F14 (Corrigendum) notices, due to their text-based format. F20 (Contract Modification) notices can be converted, but only the original contract information will be included, the modifications will be excluded.


36 changes: 18 additions & 18 deletions development-notices/eforms-xml/21-051959-001-EXP.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3504,7 +3504,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 11000 to eForms -->
<cbc:ID schemeName="Lot">LOT-11000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0013</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -3780,7 +3780,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 12000 to eForms -->
<cbc:ID schemeName="Lot">LOT-12000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0014</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -4056,7 +4056,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 21000 to eForms -->
<cbc:ID schemeName="Lot">LOT-21000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0015</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -4332,7 +4332,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 22000 to eForms -->
<cbc:ID schemeName="Lot">LOT-22000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0016</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -4608,7 +4608,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 31000 to eForms -->
<cbc:ID schemeName="Lot">LOT-31000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0017</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -4884,7 +4884,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 33000 to eForms -->
<cbc:ID schemeName="Lot">LOT-33000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0018</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -5160,7 +5160,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 41000 to eForms -->
<cbc:ID schemeName="Lot">LOT-41000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0019</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -5436,7 +5436,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 42000 to eForms -->
<cbc:ID schemeName="Lot">LOT-42000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0020</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -5712,7 +5712,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 51000 to eForms -->
<cbc:ID schemeName="Lot">LOT-51000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0021</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -5988,7 +5988,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 52000 to eForms -->
<cbc:ID schemeName="Lot">LOT-52000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0022</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -6264,7 +6264,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 61000 to eForms -->
<cbc:ID schemeName="Lot">LOT-61000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0023</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -6540,7 +6540,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 62000 to eForms -->
<cbc:ID schemeName="Lot">LOT-62000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0024</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -6816,7 +6816,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 71000 to eForms -->
<cbc:ID schemeName="Lot">LOT-71000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0025</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -7092,7 +7092,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 81000 to eForms -->
<cbc:ID schemeName="Lot">LOT-81000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0026</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -7368,7 +7368,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 91000 to eForms -->
<cbc:ID schemeName="Lot">LOT-91000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0027</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -7644,7 +7644,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 101000 to eForms -->
<cbc:ID schemeName="Lot">LOT-101000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0028</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -7920,7 +7920,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 111000 to eForms -->
<cbc:ID schemeName="Lot">LOT-111000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0029</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down Expand Up @@ -8196,7 +8196,7 @@
</cac:ProcurementProject>
</cac:ProcurementProjectLot>
<cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!-- WARNING: Cannot convert original TED lot or part number of 121000 to eForms -->
<cbc:ID schemeName="Lot">LOT-121000</cbc:ID>
<cbc:ID schemeName="Lot">LOT-0030</cbc:ID>
<!-- Lot cac:TenderingTerms -->
<cac:TenderingTerms>
<ext:UBLExtensions>
Expand Down
14 changes: 2 additions & 12 deletions xslt/addresses.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,6 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted ted-1 ted-2 gc n20
<xsl:variable name="path" select="functx:path-to-node-with-pos(.)"/>
<path><xsl:value-of select="$path"/></path>
<ted-address>
<!--
<xsl:call-template name="multilingual">
<xsl:with-param name="contexts" select="*:OFFICIALNAME"/>
<xsl:with-param name="local" select="''"/>
<xsl:with-param name="element" select="'OFFICIALNAME'"/>
</xsl:call-template>
<xsl:for-each select="*[not(self::*:OFFICIALNAME)]">
<xsl:copy-of select="." copy-namespaces="no"/>
</xsl:for-each>
-->
<xsl:for-each select="*">
<xsl:copy-of select="." copy-namespaces="no"/>
</xsl:for-each>
Expand Down Expand Up @@ -155,7 +145,7 @@ These instructions can be un-commented to show the variables holding the organiz
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Organization Name (BT-500)'"/></xsl:call-template>
<xsl:apply-templates select="*:OFFICIALNAME"/>
<xsl:call-template name="address"/>
<!-- Organization Identifier (BT-501) Optional for ALL subtypes -->
<!-- Organization Identifier (BT-501): Optional for ALL subtypes -->
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Organization Identifier (BT-501)'"/></xsl:call-template>
<xsl:apply-templates select="*:NATIONALID"/>
<xsl:call-template name="contact"/>
Expand Down Expand Up @@ -246,7 +236,7 @@ These instructions can be un-commented to show the variables holding the organiz
<xsl:apply-templates select="*:URL_BUYER"/>
<!-- Buyer Legal Type (BT-11): Mandatory for PIN subtypes 1, 4, and 7, CN subtypes 10, 14, 16, 19, and 23, CAN subtypes 29, 32, 35, and 36; Forbidden for CM subtypes 38-40; Optional for other subtypes -->
<xsl:call-template name="buyer-legal-type"/>
<!-- Buyer Contracting Entity (BT-740) Optional for PIN subtypes 3, 6, 9, E1, and E2, CN subtypes 14, 18, 19, and E3, CAN subtypes 27, 28, 31, 32, 35, and E4, CM subtype E5; Forbidden for other subtypes -->
<!-- Buyer Contracting Entity (BT-740): Optional for PIN subtypes 3, 6, 9, E1, and E2, CN subtypes 14, 18, 19, and E3, CAN subtypes 27, 28, 31, 32, 35, and E4, CM subtype E5; Forbidden for other subtypes -->
<xsl:call-template name="buyer-contracting-entity"/>
<!-- NOTE: TED elements CA_ACTIVITY_OTHER and CA_TYPE_OTHER contain text values in multiple languages. They cannot be converted to a codelist code value -->
<!-- Activity Authority (BT-10): Mandatory for PIN subtypes 1, 4, and 7, CN subtypes 10, 16, and 23, CAN subtypes 29 and 36; Forbidden for CN subtype 22, CM subtypes 38-40; Optional for other subtypes -->
Expand Down
10 changes: 2 additions & 8 deletions xslt/lot.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,7 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted gc n2016 n2021 pin
<xsl:call-template name="submission-language"/>
<!-- Electronic Ordering (BT-92) and Electronic Payment (BT-93) -->
<xsl:call-template name="post-award-processing"/>

<xsl:call-template name="participant-name"/>





<!-- Security Clearance Code (BT-578): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Security Clearance Code (BT-578)'"/></xsl:call-template>
<!-- Security Clearance Description (BT-732): eForms documentation cardinality (Lot) = ? | No equivalent element in TED XML -->
Expand Down Expand Up @@ -176,7 +170,7 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted gc n2016 n2021 pin
<efext:EformsExtension>
<!-- EU Funds Financing Identifier (BT-5010): eForms documentation cardinality (Lot) = ? | Optional for PIN subtypes 7-9 and CN subtypes 10-24; Forbidden for other subtypes -->
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'EU Funds Financing Identifier (BT-5010)'"/></xsl:call-template>
<!-- EU Funds Programme (BT-7220: eForms documentation cardinality (Lot) = ? | Optional for PIN subtypes 7-9 and CN subtypes 10-24; Forbidden for other subtypes -->
<!-- EU Funds Programme (BT-7220): eForms documentation cardinality (Lot) = ? | Optional for PIN subtypes 7-9 and CN subtypes 10-24; Forbidden for other subtypes -->
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'EU Funds Programme (BT-7220)'"/></xsl:call-template>
<!-- EU Funds Details (BT-6140): eForms documentation cardinality (Lot) = ? | Optional for PIN subtypes 7-9 and CN subtypes 10-24; Forbidden for other subtypes -->
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'EU Funds Details (BT-6140)'"/></xsl:call-template>
Expand Down Expand Up @@ -1143,7 +1137,7 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted gc n2016 n2021 pin
<!-- Additional Classification Code (BT-263): eForms documentation cardinality (Lot) = * | Optional for ALL Notice subtypes, No equivalent element in TED XML at Lot level -->
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Additional Classification Code (BT-263)'"/></xsl:call-template>
<xsl:apply-templates select="*:CPV_ADDITIONAL"/>
<!-- Place of Performance (BG-708) -> RealizedLocation | Mandatory for subtypes PIN 1-9, CN 10-24, CAN 29-37; Optional for VEAT 25-28, CM 38-40, E1, E2, E3, E4 and E5 -->
<!-- Place of Performance (BG-708): -> RealizedLocation | Mandatory for subtypes PIN 1-9, CN 10-24, CAN 29-37; Optional for VEAT 25-28, CM 38-40, E1, E2, E3, E4 and E5 -->
<!-- Place of Performance Additional Information (BT-728): eForms documentation cardinality (Lot) = ? | Optional for ALL subtypes -->
<xsl:call-template name="include-comment"><xsl:with-param name="comment" select="'Place of Performance Additional Information (BT-728)'"/></xsl:call-template>
<!-- Place Performance City (BT-5131): eForms documentation cardinality (Lot) = ? | Optional for ALL subtypes -->
Expand Down
Loading

0 comments on commit 49cceb8

Please sign in to comment.