Merge pull request #7 from OP-TED/release/0.3.0

Release/0.3.0
OP-TED · May 19, 2022 · ffd43b2 · ffd43b2
2 parents 5cda40f + 7e4743c
commit ffd43b2
Show file tree

Hide file tree

Showing 49 changed files with 51,606 additions and 1,639 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,23 +1,14 @@
-# TED XML Data Converter 0.2.0 Release Notes
-Below is a list of the major updates made to the Converter repository in this release. There was no substantial change to the XSLT code.
+# TED XML Data Converter 0.3.0 Release Notes
+Below is a list of the updates made to the Converter repository in this release. 
 
-## Folder names changed
-The four root folders were renamed to more clearly reflect their contents and purposes.
-
-## Removal of unnecessary files
-A number of files that were used during initial development, but are now no longer required, were removed.
-
-## File names changed
-The names of the Markdown files were changed to "kebab-case", to improve readability.
-
-## Markdown documentation
-The documentation in the various Markdown files was re-written to improve understanding of the different topics.
-A README.md file was added to every main folder to describe the contents of the folder.
-
-## Converted development test files
-The test notices in folder development-notices/ted-xml were all converted using this version of the converter, updating the output files in folder development-notices/eforms-files.
-
-## XSLT template location
-Some XSLT templates used in more than one location were moved into a new XSLT file, common.xslt. 
+## Contract Notices
+Templates have been added to convert elements in TED XML Contract Notice forms F05, F12, F21, F22, F23, F24
 
+## Bug fixes and minor changes
 
+* Missing listName attributes have been added, and some listName attribute values have been corrected.
+* Additional CPV codes are now included
+* TED XML element ADDRESS_FURTHER_INFO_IDEM included in conversion
+* NUTS2021 codes are now included
+* Country codes are now converted from 2-letter codes in TED XML to 3-letter codes from "Countries" codelist in eForms XML
+* Namespace declarations are now harmonised across all XSLT files
diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ The versioning scheme which will be adopted for the TED XML Data Converter will
 
 Feedback on this converter is welcome. Please address questions, comments and bug reports using [Github Discussions](https://github.com/OP-TED/ted-xml-data-converter/discussions).
 
-## What's next?
-Work on conversion of the remaining Contract Notice TED XML forms (F05, F12, F21, F22, F23 and F24) is ongoing.
+## Current status
+All Contract Notice TED XML forms (F02, F05, F12, F21, F22, F23 and F24) are supported. See [usage-information.md](usage-information.md) for more details.
 
 Work will begin on Contract Award notice forms in the near future.
 

diff --git a/development-methodology.md b/development-methodology.md
@@ -5,7 +5,7 @@ This page attemps to describe the technical approach to the conversion, and the
 ## Technical approach
 
 ### Business Terms
-The expression "Business Term" is exclusive to eForms. It has not been used previously for TED XML. It refers to an eForms business concept. Sometimes this will be expressed in only one structure/location in eForms XML. Often, it is relevant in multiple contexts ("top-level" Procedure, Lot, Result), and so could be expressed in more than one structure/location in eForms XML. The [Schema section of the eForms documentation](https://docs.ted.europa.eu/eforms/0.5.0/schema/index.html)  groups these contexts together (see section [Procedure, Group of Lots, Lot & Part related information](https://docs.ted.europa.eu/eforms/0.5.0/schema/procedure-lot-part-information.html) ), so that each Business Term is described only once.
+The expression "Business Term" is exclusive to eForms. It has not been used previously for TED XML. It refers to an eForms business concept. Sometimes this will be expressed in only one structure/location in eForms XML. Often, it is relevant in multiple contexts ("top-level" Procedure, Lot, Result), and so could be expressed in more than one structure/location in eForms XML. The [Schema section of the eForms documentation](https://docs.ted.europa.eu/eforms/0.6.0/schema/index.html)  groups these contexts together (see section [Procedure, Group of Lots, Lot & Part related information](https://docs.ted.europa.eu/eforms/0.6.0/schema/procedure-lot-part-information.html) ), so that each Business Term is described only once.
 
 Since this document is expressly about XSLT conversion, it will focus mainly on XML elements, and less about Business Terms. Hence, the term "XML structure" will be used to refer to a single XML element or XML structure; this may or may not be an expression of a single Business Term.
 

diff --git a/development-notices/README.md b/development-notices/README.md
@@ -18,6 +18,7 @@ This table lists the TED XML files selected to test development of the Converter
 | 20-156049-001-EXP.xml | F02 | CN | Addresses | multiple URL_BUYER |
 | 20-377805-001-EXP.xml | F02 | CN | Lot | TIME_RECEIPT_TENDERS with one digit for hour |
 | 21-119240-001-EXP.xml | F02 | CN | Lot | REDUCTION_RECOURSE |
+| 21-119240-001-EXP.xml | F02 | CN | Lot Selection Criteria | RULES_CRITERIA |
 | 20-566267-001-EXP.xml | F02 | CN | Lot | FRAMEWORK and DPS_ADDITIONAL_PURCHASERS |
 | 20-295737-001-EXP.xml | F21 | CN | Procedure | MAIN_FEATURES_AWARD |
 | 21-120407-001-EXP.xml | F02 | CN | Dates | DATE_TENDER_VALID |
@@ -30,6 +31,8 @@ This table lists the TED XML files selected to test development of the Converter
 | 20-156983-001-EXP.xml | F02 | CN | NUTS | 2 NUTS3 codes, MAIN_SITE with 1 P |
 | 21-077815-001-EXP.xml | F02 | CN | NUTS | 2 NUTS3 codes, MAIN_SITE with 2 P |
 | 20-343258-001-EXP.xml | F02 | CN | NUTS | 5 NUTS3 codes, MAIN_SITE with 5 P |
+| 21-363118-001-EXP.xml | F12 | CN | Lot Selection Criteria | CRITERIA_SELECTION |
+| 20-179994-001-EXP.xml | F12 | CN | Prize | NUMBER_VALUE_PRIZE and DETAILS_PAYMENT |
 | 352907_2021.xml | F02 | CN |  |  |
 | 353820_2021.xml | F02 | CN |  |  |
 | 352444_2021.xml | F02 | CN |  |  |

diff --git a/development-notices/eforms-xml/20-155018-001-EXP.xml b/development-notices/eforms-xml/20-155018-001-EXP.xml
@@ -13,7 +13,7 @@
          <ext:ExtensionContent>
             <efext:EformsExtension><!--Notice SubType (OPP-070)-->
                <efac:NoticeSubType>
-                  <cbc:SubTypeCode>4</cbc:SubTypeCode>
+                  <cbc:SubTypeCode listName="notice-subtype">4</cbc:SubTypeCode>
                </efac:NoticeSubType>
                <!-- efac:Organizations here -->
                <efac:Organizations>
@@ -22,7 +22,7 @@
                         <cbc:WebsiteURI>www.veitshoechheim.de</cbc:WebsiteURI>
                         <!--Organization Technical Identifier (OPT-200)-->
                         <cac:PartyIdentification>
-                           <cbc:ID schemeName="organization">ORG-001</cbc:ID>
+                           <cbc:ID schemeName="organization">ORG-0001</cbc:ID>
                         </cac:PartyIdentification>
                         <!--Organization Name (BT-500)-->
                         <cac:PartyName>
@@ -38,7 +38,7 @@
                            <cbc:CountrySubentityCode listName="nuts">DE26C</cbc:CountrySubentityCode>
                            <!--Organization Country Code (BT-514)-->
                            <cac:Country>
-                              <cbc:IdentificationCode>DE</cbc:IdentificationCode>
+                              <cbc:IdentificationCode listName="country">DEU</cbc:IdentificationCode>
                            </cac:Country>
                         </cac:PostalAddress>
                         <!--Organization Identifier (BT-501)-->
@@ -87,20 +87,21 @@
    <!-- cac:ContractingParty here -->
    <cac:ContractingParty><!--Buyer Profile URL (BT-508)--><!--Buyer Legal Type (BT-11) and Buyer Contracting Entity (BT-740)--><!--Buyer Legal Type (BT-11)-->
       <cac:ContractingPartyType>
-         <cbc:PartyType>ra</cbc:PartyType>
+         <cbc:PartyTypeCode listName="buyer-legal-type">ra</cbc:PartyTypeCode>
       </cac:ContractingPartyType>
       <!--Buyer Contracting Entity (BT-740)-->
+      <!--WARNING: "Buyer contracting type" codelist not yet available. Value "not-cont-ent" used as a default-->
       <cac:ContractingPartyType>
-         <cbc:PartyType>buyer-contracting-type</cbc:PartyType>
+         <cbc:PartyTypeCode listName="buyer-contracting-type">not-cont-ent</cbc:PartyTypeCode>
       </cac:ContractingPartyType>
       <!--Activity Authority (BT-10) and Activity Entity (BT-610)-->
       <!--Activity Authority (BT-10)-->
       <cac:ContractingActivity>
-         <cbc:ActivityTypeCode>GENERAL_PUBLIC_SERVICES</cbc:ActivityTypeCode>
+         <cbc:ActivityTypeCode listName="authority-activity">gen-pub</cbc:ActivityTypeCode>
       </cac:ContractingActivity>
       <cac:Party><!--Buyer Technical Identifier Reference (OPT-300)-->
          <cac:PartyIdentification>
-            <cbc:ID schemeName="organization">ORG-001</cbc:ID>
+            <cbc:ID schemeName="organization">ORG-0001</cbc:ID>
          </cac:PartyIdentification>
          <!--Reference (Technical ID) to the legal organization acting as a PSP.-->
          <!--The service provider is an eSender-->
@@ -141,10 +142,10 @@
       <cbc:ProcurementTypeCode listName="contract-nature">works</cbc:ProcurementTypeCode>
       <!--Additional Information (BT-300)-->
       <!--Estimated Value (BT-27)-->
+      <!--Main Classification Code (BT-262)-->
       <cac:MainCommodityClassification>
          <cbc:ItemClassificationCode listName="cpv">45212200</cbc:ItemClassificationCode>
       </cac:MainCommodityClassification>
-      <!--Main Classification Code (BT-262)-->
       <!--Additional Classification Code (BT-263)-->
       <!--Place of Performance Additional Information (BT-728)-->
       <!--Place Performance City (BT-5131)-->
@@ -173,8 +174,6 @@
          <!--Recurrence Description (BT-95)-->
          <!--Security Clearance Deadline (BT-78)-->
          <!--Multiple Tenders (BT-769)-->
-         <!--Guarantee Required (BT-751)-->
-         <!--Guarantee Required Description (BT-75)-->
          <!--Documents Restricted Justification (BT-707)-->
          <!--Documents Official Language (BT-708)-->
          <!--Documents Unofficial Language (BT-737)-->
@@ -193,15 +192,21 @@
          <!--Terms Performance (BT-70)-->
          <!--Submission Electronic Catalog (BT-764)-->
          <!--Submission Electronic Signature (BT-744)-->
-         <cac:AwardingTerms><!--Following Contract (BT-41)--><!--Jury Decision Binding (BT-42)--><!--No Negotiation Necessary (BT-120)--><!--Jury Member Name (BT-46)-->
-            <cac:TechnicalCommitteePerson>
-               <cbc:FamilyName/>
-            </cac:TechnicalCommitteePerson>
-         </cac:AwardingTerms>
+         <cac:AwardingTerms><!--Following Contract (BT-41)--><!--Jury Decision Binding (BT-42)--><!--No Negotiation Necessary (BT-120)--><!--*** start of cac:AwardingCriterion ***--><!--Award Criteria Order Justification (BT-733)--><!--Award Criteria Complicated (BT-543)--><!--Award Criterion Number Weight (BT-5421)--><!--Award Criterion Number Fixed (BT-5422)--><!--Award Criterion Number Threshold (BT-5423)--><!--Award Criterion Number (BT-541)--><!--Award Criterion Type (BT-539)--><!--Award Criterion Name (BT-734)--><!--Award Criterion Description (BT-540)--><!--*** end of cac:AwardingCriterion ***--><!--Jury Member Name (BT-46)--><!--Prize information (Prize Rank (BT-44), Rewards Other (BT-45), Value Prize (BT-644))--></cac:AwardingTerms>
+         <cac:AdditionalInformationParty>
+            <cac:PartyIdentification>
+               <cbc:ID schemeName="organization">ORG-0001</cbc:ID>
+            </cac:PartyIdentification>
+         </cac:AdditionalInformationParty>
          <!--Submission URL (BT-18)-->
          <!--Tender Validity Deadline (BT-98)-->
          <!--Review Deadline Description (BT-99)-->
-         <cac:AppealTerms/>
+         <!--*** start of cac:AppealTerms ***-->
+         <!--cac:PresentationPeriod: Review Deadline Description (BT-99)-->
+         <!--cac:AppealInformationParty: Review Information Providing Organization-->
+         <!--cac:AppealReceiverParty: Review organization-->
+         <!--cac:MediationParty: Mediation organization-->
+         <!--*** end of cac:AppealTerms ***-->
          <!--Submission Language (BT-97)-->
          <!--Participant Name (BT-47)-->
          <!--Security Clearance Code (BT-578)-->
@@ -267,18 +272,17 @@
          <!--Additional Information (BT-300)-->
          <!--Estimated Value (BT-27)-->
          <!--Main Classification Code (BT-262)-->
-         <!--Additional Classification Code (BT-263)-->
          <cac:MainCommodityClassification>
             <cbc:ItemClassificationCode listName="cpv">45212200</cbc:ItemClassificationCode>
          </cac:MainCommodityClassification>
+         <!--Additional Classification Code (BT-263)-->
          <!--Place of Performance Additional Information (BT-728)-->
          <!--Place Performance City (BT-5131)-->
          <!--Place Performance Post Code (BT-5121)-->
          <!--Place Performance Country Subdivision (BT-5071)-->
          <!--Place Performance Services Other (BT-727)-->
          <!--Place Performance Street (BT-5101)-->
          <!--Place Performance Country Code (BT-5141)-->
-         <!--DE26C 5 DE26C -->
          <!--Place of performance (BG-708) : Place Performance: Additional Information (BT-728), City (BT-5131), Post Code (BT-5121), Country Subdivision (BT-5071), Services Other (as a codelist) (BT-727), Street (BT-5101), Code (BT-5141)-->
          <cac:RealizedLocation>
             <cac:Address>