TEDXDC-211 - Tidied up XSLT, added missing eForms XML files, final co…

…nversion of all TED XML files
OP-TED · Jul 28, 2022 · 27c3d9f · 27c3d9f
1 parent 61c3309
commit 27c3d9f
Show file tree

Hide file tree

Showing 51 changed files with 4,031 additions and 1,863 deletions.
diff --git a/development-notices/README.md b/development-notices/README.md
@@ -37,6 +37,9 @@ This table lists the TED XML files selected to test development of the Converter
 | 353820_2021.xml | F02 | CN |  |  |
 | 352444_2021.xml | F02 | CN |  |  |
 | 352458_2021.xml | F02 | CN |  |  |
+| 354625_2021.xml | F12 | CN |  |  |
+| 354626_2021.xml | F12 | CN |  |  |
+| 354823_2021.xml | F12 | CN |  |  |
 | 352425_2021.xml | F03 | CAN | Contract award | PT_AWARD_CONTRACT_WITHOUT_CALL |
 | 353237_2021.xml | F03 | CAN | Contract award | TERMINATION_PIN |
 | 20-157399-001-EXP.xml | F03 | CAN | SettledContract | No DPS, no FRAMEWORK |

diff --git a/development-notices/eforms-xml/20-155018-001-EXP.xml b/development-notices/eforms-xml/20-155018-001-EXP.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--WARNING: TED date elements have no time zone associated. For all dates in this notice, the time zone is assumed to be CET, i.e. UTC+01:00 -->
-<PriorInformationNotice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-                        xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                        xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2"
-                        xmlns:efac="http://data.europa.eu/p27/eforms-ubl-extension-aggregate-components/1"
-                        xmlns:efbc="http://data.europa.eu/p27/eforms-ubl-extension-basic-components/1"
-                        xmlns:efext="http://data.europa.eu/p27/eforms-ubl-extensions/1"
-                        xmlns:ccts="urn:un:unece:uncefact:documentation:2"
-                        xmlns="urn:oasis:names:specification:ubl:schema:xsd:PriorInformationNotice-2">
+<PriorInformationNotice xmlns="urn:oasis:names:specification:ubl:schema:xsd:PriorInformationNotice-2"
+                         xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                         xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                         xmlns:ccts="urn:un:unece:uncefact:documentation:2"
+                         xmlns:efac="http://data.europa.eu/p27/eforms-ubl-extension-aggregate-components/1"
+                         xmlns:efbc="http://data.europa.eu/p27/eforms-ubl-extension-basic-components/1"
+                         xmlns:efext="http://data.europa.eu/p27/eforms-ubl-extensions/1"
+                         xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2">
    <ext:UBLExtensions>
       <ext:UBLExtension>
          <ext:ExtensionContent>
             <efext:EformsExtension><!--Notice SubType (OPP-070)-->
                <efac:NoticeSubType>
                   <cbc:SubTypeCode listName="notice-subtype">4</cbc:SubTypeCode>
                </efac:NoticeSubType>
-               <!-- efac:Organizations here -->
+               <!-- efac:Organizations -->
                <efac:Organizations>
                   <efac:Organization><!--Organization Subrole (BT-770) : Group leader (Buyer)--><!--Organization Role : Acquiring CPB-->
                      <efac:Company><!--Organization Internet Address (BT-505)-->
@@ -53,7 +53,7 @@
                      </efac:Company>
                   </efac:Organization>
                </efac:Organizations>
-               <!-- efac:Publication here -->
+               <!-- efac:Publication -->
                <efac:Publication><!--Notice Publication ID (OPP-010)-->
                   <efbc:NoticePublicationID schemeName="ojs-notice-id">12345678-2023</efbc:NoticePublicationID>
                   <!--OJEU Identifier (OPP-011)-->
@@ -85,7 +85,7 @@
    <cbc:NoticeTypeCode listName="competition">cn-standard</cbc:NoticeTypeCode>
    <!--Notice Official Language (BT-702) (first)-->
    <cbc:NoticeLanguageCode>DEU</cbc:NoticeLanguageCode>
-   <!-- cac:ContractingParty here -->
+   <!-- cac:ContractingParty -->
    <cac:ContractingParty><!--Buyer Profile URL (BT-508)--><!--Buyer Legal Type (BT-11)-->
       <cac:ContractingPartyType>
          <cbc:PartyTypeCode listName="buyer-legal-type">ra</cbc:PartyTypeCode>
@@ -112,9 +112,9 @@
          <!--Reference (Technical ID) to the legal organization acting as a Buyer.-->
       </cac:Party>
    </cac:ContractingParty>
-   <!-- cac:TenderingTerms here -->
+   <!-- cac:TenderingTerms -->
    <cac:TenderingTerms><!--Cross Border Law (BT-09)--><!--BT-01 Legal Basis Local - Text--><!--Exclusion Grounds (BT-67)--><!--Lots Max Awarded (BT-33)--><!--Lots Max Allowed (BT-31)--><!--Group Identifier (BT-330)--><!--Group Lot Identifier (BT-1375)--></cac:TenderingTerms>
-   <!-- cac:TenderingProcess here -->
+   <!-- cac:TenderingProcess -->
    <cac:TenderingProcess>
       <ext:UBLExtensions>
          <ext:UBLExtension>
@@ -133,7 +133,7 @@
       <!--Direct Award Justification (BT-136)-->
       <!--Direct Award Justification (BT-135)-->
    </cac:TenderingProcess>
-   <!-- cac:ProcurementProject here -->
+   <!-- cac:ProcurementProject -->
    <cac:ProcurementProject><!--Internal Identifier (BT-22)--><!--Title (BT-21)-->
       <cbc:Name languageID="DEU">Gemeinde Veitshöchheim, Sportplatzbauarbeiten an der Freisportanlage</cbc:Name>
       <!--Description (BT-24)-->
@@ -155,12 +155,12 @@
       <!--Place Performance Street (BT-5101)-->
       <!--Place Performance Country Code (BT-5141)-->
    </cac:ProcurementProject>
-   <!-- multiple cac:ProcurementProjectLot here -->
+   <!-- multiple cac:ProcurementProjectLot -->
    <cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!--Only one Lot in the TED notice-->
       <cbc:ID schemeName="Lot">LOT-0000</cbc:ID>
-      <!-- Lot cac:TenderingTerms here -->
+      <!-- Lot cac:TenderingTerms -->
       <cac:TenderingTerms><!--Selection Criteria Type (BT-747)--><!--Selection Criteria Name (BT-749)--><!--Selection Criteria Description (BT-750)--><!--Selection Criteria Used (BT-748)--><!--Selection Criteria Second Stage Invite (BT-40)--><!--Selection Criteria Second Stage Invite Number Weight (BT-7531)--><!--Selection Criteria Second Stage Invite Number Threshold (BT-7532)--><!--Selection Criteria Second Stage Invite Number (BT-752)--><!--Variants (BT-63)--><!--EU Funds (BT-60)--><!--Performing Staff Qualification (BT-79)--><!--Recurrence (BT-94)--><!--Recurrence Description (BT-95)--><!--Security Clearance Deadline (BT-78)--><!--Multiple Tenders (BT-769)--><!--Documents Restricted Justification (BT-707)--><!--Documents Official Language (BT-708)--><!--Documents Unofficial Language (BT-737)--><!--Terms Financial (BT-77)--><!--Reserved Participation (BT-71)--><!--Reserved Participation (BT-71)--><!--Tenderer Legal Form (BT-761)--><!--Tenderer Legal Form Description (BT-76)--><!--Late Tenderer Information (BT-771)--><!--Subcontracting Tender Indication (BT-651)--><!--Subcontracting Obligation (BT-65)--><!--Subcontracting Obligation Maximum (BT-729)--><!--Subcontracting Obligation Minimum (BT-64)--><!--Reserved Execution (BT-736)--><!--Electronic Invoicing (BT-743)--><!--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)--><!--*** 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:AwardingTerms><!--Following Contract (BT-41)--><!--Jury Decision Binding (BT-42)--><!--No Negotiation Necessary (BT-120)--><!--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)--><!--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>
@@ -169,18 +169,16 @@
          <!--Submission URL (BT-18)-->
          <!--Tender Validity Deadline (BT-98)-->
          <!--Review Deadline Description (BT-99)-->
-         <!--*** 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)-->
          <!--Security Clearance Description (BT-732)-->
       </cac:TenderingTerms>
-      <!-- cac:TenderingProcess here -->
+      <!-- cac:TenderingProcess -->
       <cac:TenderingProcess>
          <ext:UBLExtensions>
             <ext:UBLExtension>
@@ -217,7 +215,7 @@
          <!--Framework Agreement (BT-765)-->
          <!--Dynamic Purchasing System (BT-766)-->
       </cac:TenderingProcess>
-      <!-- cac:ProcurementProject here -->
+      <!-- cac:ProcurementProject -->
       <cac:ProcurementProject><!--Internal Identifier (BT-22)--><!--WARNING: Internal ID (BT-22) is required but there is no equivalent element in TED XML.-->
          <cbc:ID schemeName="InternalID"/>
          <!--Title (BT-21)-->

diff --git a/development-notices/eforms-xml/20-156049-001-EXP.xml b/development-notices/eforms-xml/20-156049-001-EXP.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--WARNING: TED date elements have no time zone associated. For all dates in this notice, the time zone is assumed to be CET, i.e. UTC+01:00 -->
-<ContractNotice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-                xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2"
-                xmlns:efac="http://data.europa.eu/p27/eforms-ubl-extension-aggregate-components/1"
-                xmlns:efbc="http://data.europa.eu/p27/eforms-ubl-extension-basic-components/1"
-                xmlns:efext="http://data.europa.eu/p27/eforms-ubl-extensions/1"
-                xmlns:ccts="urn:un:unece:uncefact:documentation:2"
-                xmlns="urn:oasis:names:specification:ubl:schema:xsd:ContractNotice-2">
+<ContractNotice xmlns="urn:oasis:names:specification:ubl:schema:xsd:ContractNotice-2"
+                 xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                 xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                 xmlns:ccts="urn:un:unece:uncefact:documentation:2"
+                 xmlns:efac="http://data.europa.eu/p27/eforms-ubl-extension-aggregate-components/1"
+                 xmlns:efbc="http://data.europa.eu/p27/eforms-ubl-extension-basic-components/1"
+                 xmlns:efext="http://data.europa.eu/p27/eforms-ubl-extensions/1"
+                 xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2">
    <ext:UBLExtensions>
       <ext:UBLExtension>
          <ext:ExtensionContent>
             <efext:EformsExtension><!--Notice SubType (OPP-070)-->
                <efac:NoticeSubType>
                   <cbc:SubTypeCode listName="notice-subtype">16</cbc:SubTypeCode>
                </efac:NoticeSubType>
-               <!-- efac:Organizations here -->
+               <!-- efac:Organizations -->
                <efac:Organizations>
                   <efac:Organization><!--Organization Subrole (BT-770) : Group leader (Buyer)-->
                      <efbc:GroupLeadIndicator>true</efbc:GroupLeadIndicator>
@@ -217,7 +217,7 @@
                      </efac:Company>
                   </efac:Organization>
                </efac:Organizations>
-               <!-- efac:Publication here -->
+               <!-- efac:Publication -->
                <efac:Publication><!--Notice Publication ID (OPP-010)-->
                   <efbc:NoticePublicationID schemeName="ojs-notice-id">12345678-2023</efbc:NoticePublicationID>
                   <!--OJEU Identifier (OPP-011)-->
@@ -249,7 +249,7 @@
    <cbc:NoticeTypeCode listName="competition">cn-standard</cbc:NoticeTypeCode>
    <!--Notice Official Language (BT-702) (first)-->
    <cbc:NoticeLanguageCode>HUN</cbc:NoticeLanguageCode>
-   <!-- cac:ContractingParty here -->
+   <!-- cac:ContractingParty -->
    <cac:ContractingParty><!--Buyer Profile URL (BT-508)-->
       <cbc:BuyerProfileURI>http://www.nfp.hu</cbc:BuyerProfileURI>
       <!--Buyer Legal Type (BT-11)-->
@@ -342,9 +342,9 @@
          <!--Reference (Technical ID) to the legal organization acting as a Buyer.-->
       </cac:Party>
    </cac:ContractingParty>
-   <!-- cac:TenderingTerms here -->
+   <!-- cac:TenderingTerms -->
    <cac:TenderingTerms><!--Cross Border Law (BT-09)--><!--BT-01 Legal Basis Local - Text--><!--Exclusion Grounds (BT-67)--><!--Lots Max Awarded (BT-33)--><!--Lots Max Allowed (BT-31)--><!--Group Identifier (BT-330)--><!--Group Lot Identifier (BT-1375)--></cac:TenderingTerms>
-   <!-- cac:TenderingProcess here -->
+   <!-- cac:TenderingProcess -->
    <cac:TenderingProcess>
       <ext:UBLExtensions>
          <ext:UBLExtension>
@@ -364,7 +364,7 @@
       <!--Direct Award Justification (BT-136)-->
       <!--Direct Award Justification (BT-135)-->
    </cac:TenderingProcess>
-   <!-- cac:ProcurementProject here -->
+   <!-- cac:ProcurementProject -->
    <cac:ProcurementProject><!--Internal Identifier (BT-22)-->
       <cbc:ID schemeName="InternalID">EKR000316682020</cbc:ID>
       <!--Title (BT-21)-->
@@ -389,10 +389,10 @@
       <!--Place Performance Street (BT-5101)-->
       <!--Place Performance Country Code (BT-5141)-->
    </cac:ProcurementProject>
-   <!-- multiple cac:ProcurementProjectLot here -->
+   <!-- multiple cac:ProcurementProjectLot -->
    <cac:ProcurementProjectLot><!--Purpose Lot Identifier (BT-137)--><!--Only one Lot in the TED notice-->
       <cbc:ID schemeName="Lot">LOT-0000</cbc:ID>
-      <!-- Lot cac:TenderingTerms here -->
+      <!-- Lot cac:TenderingTerms -->
       <cac:TenderingTerms>
          <ext:UBLExtensions>
             <ext:UBLExtension>
@@ -438,6 +438,10 @@
                         <!--Selection Criteria Used (BT-748)-->
                         <cbc:CalculationExpressionCode listName="usage">used</cbc:CalculationExpressionCode>
                      </efac:SelectionCriteria>
+                     <!--Selection Criteria Type (BT-747)-->
+                     <!--Selection Criteria Name (BT-749)-->
+                     <!--Selection Criteria Description (BT-750)-->
+                     <!--Selection Criteria Used (BT-748)-->
                      <!--Selection Criteria Second Stage Invite (BT-40)-->
                      <!--Selection Criteria Second Stage Invite Number Weight (BT-7531)-->
                      <!--Selection Criteria Second Stage Invite Number Threshold (BT-7532)-->
@@ -504,7 +508,7 @@
             <cbc:ExecutionRequirementCode listName="ecatalog-submission"/>
          </cac:ContractExecutionRequirement>
          <!--Submission Electronic Signature (BT-744)-->
-         <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)-->
+         <cac:AwardingTerms><!--Following Contract (BT-41)--><!--Jury Decision Binding (BT-42)--><!--No Negotiation Necessary (BT-120)--><!--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)-->
             <cac:AwardingCriterion>
                <cac:SubordinateAwardingCriterion><!--Award Criterion Number (BT-541)-->
                   <ext:UBLExtensions>
@@ -601,7 +605,6 @@
                   </ext:UBLExtensions>
                </cac:SubordinateAwardingCriterion>
             </cac:AwardingCriterion>
-            <!--*** 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>
@@ -622,7 +625,6 @@
             <cbc:DurationMeasure unitCode="MONTH">2</cbc:DurationMeasure>
          </cac:TenderValidityPeriod>
          <!--Review Deadline Description (BT-99)-->
-         <!--*** start of cac:AppealTerms ***-->
          <!--cac:PresentationPeriod: Review Deadline Description (BT-99)-->
          <!--cac:AppealInformationParty: Review Information Providing Organization-->
          <!--cac:AppealReceiverParty: Review organization-->
@@ -642,7 +644,6 @@
                </cac:PartyIdentification>
             </cac:AppealReceiverParty>
          </cac:AppealTerms>
-         <!--*** end of cac:AppealTerms ***-->
          <!--Submission Language (BT-97)-->
          <cac:Language>
             <cbc:ID>HUN</cbc:ID>
@@ -656,7 +657,7 @@
          <!--Security Clearance Code (BT-578)-->
          <!--Security Clearance Description (BT-732)-->
       </cac:TenderingTerms>
-      <!-- cac:TenderingProcess here -->
+      <!-- cac:TenderingProcess -->
       <cac:TenderingProcess>
          <ext:UBLExtensions>
             <ext:UBLExtension>
@@ -726,7 +727,7 @@
             <cbc:ContractingSystemTypeCode listName="dps-usage">none</cbc:ContractingSystemTypeCode>
          </cac:ContractingSystem>
       </cac:TenderingProcess>
-      <!-- cac:ProcurementProject here -->
+      <!-- cac:ProcurementProject -->
       <cac:ProcurementProject><!--Internal Identifier (BT-22)--><!--WARNING: Internal ID (BT-22) is required but there is no equivalent element in TED XML.-->
          <cbc:ID schemeName="InternalID"/>
          <!--Title (BT-21)-->