Merge pull request #19 from OP-TED/develop

Develop

CHANGELOG.md

@@ -1,38 +1,42 @@
 
-# TED XML Data Converter 0.5.0 Release Notes
-
-## 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.
-
-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).
-
-## 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%.
-
-## 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
+# TED XML Data Converter 0.6.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.
+
+## Previous versions of R2.0.9 schema
+
+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.
+
+The different namspaces were declared with prefixes as follows:
+
+| 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 |
+
+
+* 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
-* 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
+* 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

README.md

@@ -49,8 +49,20 @@ 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?
-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.
+## Current status
 
-Work will begin on the PIN (Prior / Periodic Information Notice) notice forms (F01, F04, F07, F08, F21 and F22) in the near future.
+All the standard TED XML forms using the R2.0.9 TED XML schema  (with the exceptions of F14 Corrigendum and F20 Modification) are now convertible:
+
+* PIN (Prior information notice / Periodic indicative notice)
+(F01, F04, F07, F08, F21 and F22)
+
+* Contract Notice
+(F02, F05, F12, F21, F22, F23 and F24)
+
+* Contract Award Notice
+(F03, F06, F13, F15, F21, F22, F23, F24 and F25)
+
+### What's next?
+
+Work on the Defense TED XML forms using the R2.0.8 TED XML schema has begun.
 

development-notices/README.md

@@ -66,3 +66,4 @@ This table lists the TED XML files selected to test development of the Converter
 | 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 |
+| 21-048169-001-EXP.xml | F03 | CAN | Lot | EU_PROGR_RELATED |