Skip to content

Commit

Permalink
Merge pull request #21 from OP-TED/prepare/1.0.0
Browse files Browse the repository at this point in the history
Prepare/1.0.0
  • Loading branch information
pdonohoe authored Oct 10, 2023
2 parents 2f43539 + 7520f69 commit 9ba23cf
Show file tree
Hide file tree
Showing 121 changed files with 24,471 additions and 9,336 deletions.
50 changes: 16 additions & 34 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,42 +1,24 @@

# TED XML Data Converter 0.6.0 Release Notes
# TED XML Data Converter 1.0.0 Release Notes

## Prior Information Notices - TED forms F01, F04, F08, F21, F22, F23
Templates have been added to convert elements in TED XML Prior Information
Notice forms F01, F04, F08, F21, F22, F23.
This is the first production-ready release of the TED XML Data Converter. It 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.

## Previous versions of R2.0.9 schema
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.

In some previous versions of the R2.0.9 schema, different namespace URIs were used. To allow processing of XML files using these schemas without requiring extensive changes to the XSLT code, the "ted" namespace prefix used to reference TED elements was replaced by the * wildcard. Similarly, the "nuts" namespace prefix was replaced by the * wildcard to reference prior versions of the NUTS schema.
## Code changes

The different namspaces were declared with prefixes as follows:
* Conversion of Design Contest forms F12 and F13
* Improved reporting of errors for notices which cannot be converted
* Fixed subtype mapping for form F15
* Added mapping from DIRECTIVE to Procedure Legal Basis (BT-01)
* Derived OJEU Identifier (OPP-011) and OJEU Publication Date (OPP-012) from TED XML
* Added Description elements to countries-map.xml and languages-map.xml
* Added new test notices to cover all convertible forms and elements

| prefix | namespace URI |
| --- | --- |
| ted | http://publications.europa.eu/resource/schema/ted/R2.0.9/publication |
| ted-1 | http://formex.publications.europa.eu/ted/schema/export/R2.0.9.S01.E01 |
| ted-2 | ted/R2.0.9.S02/publication |
| n2021 | http://publications.europa.eu/resource/schema/ted/2021/nuts |
| n2016 | http://publications.europa.eu/resource/schema/ted/2016/nuts |
| n2016-1 | ted/2016/nuts |
## Bug fixes

* Where INFO_ADD and URL_NATIONAL_PROCEDURE exist together
* Mapping for F15, Directive 2014/25/EU
* BT-163 Concession Value Description
* Links to previous notices: Previous Planning Identifier (BT-125(i)) and Previous Notice Identifier (OPP-090)

* added new namespace declarations
* changed references to TED elements to use the * wildcard for the namespace prefix

## 2022 Amendment to the eForms Regulation

The amendment to the 2019 eForms Implementing Regulation published in November 2022 [http://data.europa.eu/eli/reg_impl/2022/2303/oj](http://data.europa.eu/eli/reg_impl/2022/2303/oj) changed and added several business terms.


## New parameters to set values for Business Terms

* `"notice-identifier"` for `BT-701 Notice Identifier`
* `"procedure-identifier"` for `BT-04 Procedure Identifier`
* `"sdk-version"` for the SDK version

eforms-notice-subtypes.xml

## Minor changes
* Added mapping file eforms-notice-subtypes.xml to define BT-02 Notice Type and BT-03 Form Type
* The format of the LotResult Technical ID (OPT-322) was corrected
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ Each folder also contains a README.md file listing the files in that folder and

Basic usage instructions for developers to run the code in their own system is available [here](usage-information.md).

An API for this converter will be made available soon.


## Versioning scheme

Expand Down
45 changes: 29 additions & 16 deletions development-notices/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@ This table lists the TED XML files selected to test development of the Converter
| 21-064844-001-EXP.xml | F02 | CN | Addresses | All 7 Address elements, 1 duplicated address |
| 20-587026-001-EXP.xml | F02 | CN | Procurement | PROCUREMENT_LAW -> BT-01 Legal Basis Local - Text |
| 20-260117-001-EXP.xml | F02 | CN | Procurement | ACCELERATED_PROC -> BT-106 Procedure Accelerated |
| 20-213571-001-EXP.xml | F02 | CN | Procurement | CPV_CODE -> BT-262 Main Classification Codes |
| 21-120407-001-EXP.xml | F02 | CN | Lot | DATE_TENDER_VALID |
| 20-162034-001-EXP.xml | F02 | CN | Lot | Multiple Tendering languages |
| 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 |
| 21-119240-001-EXP.xml | F05 | CN | Lot Selection Criteria | RULES_CRITERIA and REDUCTION_RECOURSE |
| 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 |
Expand All @@ -33,17 +30,16 @@ This table lists the TED XML files selected to test development of the Converter
| 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 | | |
| 352458_2021.xml | F02 | CN | | |
| 354625_2021.xml | F12 | CN | Award Criteria | MEMBER_NAME |
| 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 |
| 352732_2021.xml | F03 | CAN | | |
| 354339_2021.xml | F03 | CAN | | |
| 21-364236-001-EXP.xml | F02 | CN | | |
| 21-363066-001-EXP.xml | F02 | CN | | |
| 21-363062-001-EXP.xml | F02 | CN | | |
| 21-362774-001-EXP.xml | F02 | CN | | |
| 21-364516-001-EXP.xml | F12 | CN | Award Criteria | MEMBER_NAME |
| 21-364082-001-EXP.xml | F05 | CN | | |
| 21-357646-001-EXP.xml | F03 | CAN | Contract award | PT_AWARD_CONTRACT_WITHOUT_CALL |
| 21-362579-001-EXP.xml | F03 | CAN | Contract award | TERMINATION_PIN |
| 21-364180-001-EXP.xml | F03 | CAN | | |
| 21-364240-001-EXP.xml | F03 | CAN | | |
| 20-157399-001-EXP.xml | F03 | CAN | SettledContract | No DPS, no FRAMEWORK |
| 20-157543-001-EXP.xml | F03 | CAN | SettledContract | FRAMEWORK |
| 22-086633-001-EXP.xml | F03 | CAN | SettledContract | Multiple AWARD_CONTRACT collated into one SettledContract |
Expand All @@ -54,7 +50,7 @@ This table lists the TED XML files selected to test development of the Converter
| 21-149886-001-EXP.xml | F15 | CAN | Award Criteria | DIRECTIVE_2014_23_EU |
| 21-298854-001-EXP.xml | F15 | CAN | Award Criteria | DIRECTIVE_2009_81_EC/AC/AC_PRICE |
| 22-073124-001-EXP.xml | F15 | CAN | Award Criteria | DIRECTIVE_2009_81_EC/AC/AC_CRITERIA |
| 21-119282-001-EXP.xml | F24 | CAN | Award Criteria | AC/AC_CRITERION |
| 21-119282-001-EXP.xml | F24 | CN | Award Criteria | AC/AC_CRITERION |
| 21-205737-001-EXP.xml | F25 | CAN | Award Criteria | AC/AC_CRITERION |
| 19-271873-001-EXP.xml | F03 | CAN | Framework | 109 Lots, 5 Awards |
| 20-168879-001-EXP.xml | F03 | CAN | Performance analysis | 652 Lots, 1105 Awards |
Expand All @@ -67,3 +63,20 @@ This table lists the TED XML files selected to test development of the Converter
| 19-289373-001-EXP.xml | F22 | CN | Subtype mapping | Notice type QSU_CALL_COMPETITION |
| 20-318547-001-EXP.xml | F22 | CN | Lot | QS/INDEFINITE_DURATION |
| 21-048169-001-EXP.xml | F03 | CAN | Lot | EU_PROGR_RELATED |
| 18-536293-001-EXP.xml | F13 | CAN | Design Result | Multiple WINNER elements |
| 19-111211-001-EXP.xml | F13 | CAN | Design Result | NO_AWARDED_PRIZE |
| 20-620029-001-EXP.xml | F07 | CN | Qualification System | Call for competition |
| 20-271232-001-EXP.xml | F07 | CN | Qualification System | Call for competition |
| 19-099886-001-EXP.xml | F08 | PIN | Buyer Profile | Example of F08 |
| 18-412273-001-EXP.xml | F06 | CAN | Result | VAL_SUBCONTRACTING |
| 22-434184-001-EXP.xml | F04 | PIN | PIN RTL | LOT_MAX_NUMBER |
| 19-090974-001-EXP.xml | F21 | CN | Lot | RESERVED_ORGANISATIONS_SERVICE_MISSION, RESTRICTED_SHELTERED_PROGRAM, RESTRICTED_SHELTERED_WORKSHOP |
| 19-318420-001-EXP.xml | F25 | CAN | Result | CALCULATION_METHOD, INFO_ADD_VALUE, VAL_PRICE_PAYMENT, VAL_REVENUE |
| 18-151256-001-EXP.xml | F12 | CN | Design | DIRECTIVE, NB_MAX_PARTICIPANTS, NB_MIN_PARTICIPANTS, PARTICIPANT_NAME |
| 23-119901-001-EXP.xml | F14 | XX | Corrigendum | F14 notices cannot be converted |
| 18-156915-001-EXP.xml | F13 | CAN | Result | NB_PARTICIPANTS_OTHER_EU, NB_PARTICIPANTS_SME |
| 18-168448-001-EXP.xml | F02 | CN | Lot | INFO_ADD_EAUCTION |




Loading

0 comments on commit 9ba23cf

Please sign in to comment.