Skip to content

Commit

Permalink
Merge pull request #11 from OP-TED/release/0.5.0
Browse files Browse the repository at this point in the history
Release/0.5.0
  • Loading branch information
nhajlaoui authored Sep 16, 2022
2 parents 05c978f + ccf6597 commit 949687c
Show file tree
Hide file tree
Showing 102 changed files with 328,901 additions and 2,346 deletions.
41 changes: 31 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@

# TED XML Data Converter 0.4.0 Release Notes
# TED XML Data Converter 0.5.0 Release Notes

## Contract Award Notices - TED form F03
## Contract Award Notices - TED forms F06, F13, F15, F21, F22, F23, F24, F25
Templates have been added to convert elements in TED XML Contract Award
Notice forms F06, F13, F15, F21, F22, F23, F24, F25.

The majority of changes included in this release are for the conversion of TED form F03, a Contract Award Notice. A new XSLT stylesheet, notice-result.xslt, has been created for this.
A mapping for all TED elements defining justifications for direct awards to
values of the "direct-award-justification" codelist has been created for
BT-136 (Direct Award Justification).

New mappings for "direct-award-justification", "non-award-justification" and "received-submission-type" have been added to other-mappings.xslt
## Multilingual Business Terms
A new template has been created to handle the conversion of multilingual text,
and the code for all such BTs has been updated to use it. One TED element,
URL_NATIONAL_PROCEDURE required the addition of static text included in the form PDF. The XML file
"translations.xml" was created to hold the translations of the associated
labels from the source TED form PDFs.

## Improved performance
Performance analysis of the converter revealed a significant amount of time
was spent parsing the large codelist files "countries.xml" and "languages.xml".
A separate XSLT file "create-ted-map.xslt" was written to create the smaller XML
files "countries-map.xml" and "languages-map.xml". The use of these XML files
instead of the original codelists reduced processing time by more than 50%.

## Minor changes
## Control of the output of BT comments and warning messages
Two new templates "include-comment" and "report-warning" were added to the XSLT
file functions-and-data.xslt in order to consolidate the processing of comments
and warnings. Parameters were added to these templates to control their output; by
default their values are set to 1, which allows the output of these templates.
* "includecomments": set to 0 to suppress the "BT" comments from the output eForms XML
* "includewarnings": set to 0 to suppress the "WARNING" comments from the output eForms XML
* "showwarnings": set to 0 to suppress the "WARNING" comments from the output to the console

Minor fixes for:
* Buyer Legal Type (BT-11)
* Buyer Contracting Entity (BT-740)
* Electronic Auction (BT-767)
* PIN Competition Termination (BT-756)
## Minor changes
* Minor fixes for Award Criteria and Contract Extension
* Improved conversion of values in AC_WEIGHTING
* The meaning of "cardinality" in HTML comments in the XSLT was clarified
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ Feedback on this converter is welcome. Please address questions, comments and bu


## What's next?
All Contract Notice TED XML forms (F02, F05, F12, F21, F22, F23 and F24) are convertible.
All Contract Notice TED XML forms (F02, F05, F12, F21, F22, F23 and F24), and all Contract Award notice forms (F06, F13, F15, F21, F22, F23, F24 and F25) are convertible.

The F03 Contract Award Notice form is convertible.

Work will begin on the remaining Contract Award notice forms (F06, F13, F15, F21, F22, F23, F24 and F25) in the near future.
Work will begin on the PIN (Prior / Periodic Information Notice) notice forms (F01, F04, F07, F08, F21 and F22) in the near future.

27 changes: 21 additions & 6 deletions development-notices/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,32 @@ 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 | | |
| 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 | | |
| 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 |
| 22-091559-001-EXP.xml | F03 | CAN | SettledContract | NO_AWARDED_CONTRACT |





| 21-139343-001-EXP.xml | F15 | CAN | Award Criteria | DIRECTIVE_2014_24_EU/AC/AC_PRICE |
| 22-023722-001-EXP.xml | F15 | CAN | Award Criteria | DIRECTIVE_2014_24_EU/AC/AC_COST |
| 21-158592-001-EXP.xml | F15 | CAN | Award Criteria | DIRECTIVE_2014_25_EU/AC/AC_PRICE |
| 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-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 |
| 20-537923-001-EXP.xml | F03 | CAN | Performance analysis | 5 Lots, 178 Awards |
| 22-104446-001-EXP.xml | F02 | CN | Multilingual | 3 ORIGINAL languages, 3 Lots |
| 22-109282-001-EXP.xml | F03 | CAN | Multilingual | 1 ORIGINAL language, 23 TRANSLATION languages, 3 Lots, 6 Awards |
| 21-419119-001-EXP.xml | F12 | CN | Multilingual | 1 ORIGINAL language, 23 TRANSLATION languages, DETAILS_PAYMENT and NUMBER_VALUE_PRIZE |
| 22-011421-001-EXP.xml | F03 | CAN | Multilingual | 1 ORIGINAL language, 23 TRANSLATION languages, INFO_ADD_SUBCONTRACTING |
| 21-635824-001-EXP.xml | F21 | CAN | Multilingual | 1 ORIGINAL language, 23 TRANSLATION languages, modified to add URL_NATIONAL_PROCEDURE |
| 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 |
Loading

0 comments on commit 949687c

Please sign in to comment.