Skip to content

Commit 32f196a

Browse files
schivmeisterschivmeister
authored
Merge pull request #119 from OP-TED/feature/more-eforms2-retractions
More retractions for pre-existing CN/EF29 mappings
2 parents 360824a + 7ecabc2 commit 32f196a

175 files changed

Lines changed: 1384 additions & 976 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎mappings/package_eforms_sdk1.10_epo4.0/metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@
6262
]
6363
}
6464
},
65-
"mapping_suite_hash_digest": "06618376218bc68f1b17e3affc9f51a5c8737264bc642d16e1cca88275bf7e69"
65+
"mapping_suite_hash_digest": "fa0a90eff6b91c3d794d5a76a7a0766c6072be4653efe978039016f8d980c369"
6666
}

‎mappings/package_eforms_sdk1.10_epo4.0/output/sampling_eforms_all_can-1.10/176518-2024/176518-2024.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ epd:id_078f6766-7cfd-4bfe-98e3-2ce04b236e7e_MonetaryValueProcedure_YFTDpjyGUfQWd
335335
epd:id_078f6766-7cfd-4bfe-98e3-2ce04b236e7e_MonetaryValue_5RkUZBRon4U8t9FeNL7QSi a
336336
epo:MonetaryValue;
337337
epo:hasAmountValue 2940000.0;
338-
epo:hasCurrency <http://publications.europa.eu/resource/authority/currency/EUR> .
338+
epo:hasCurrency "EUR" .
339339

340340
epd:id_078f6766-7cfd-4bfe-98e3-2ce04b236e7e_MonetaryValue_A5K3ndcSySWYxA4wrRkqDG a
341341
epo:MonetaryValue;

‎mappings/package_eforms_sdk1.10_epo4.0/output/sampling_eforms_all_can-1.10/481682-2024/481682-2024.ttl‎

Lines changed: 51 additions & 205 deletions
Large diffs are not rendered by default.

‎mappings/package_eforms_sdk1.10_epo4.0/output/sampling_eforms_all_can-1.10/519278-2024/519278-2024.ttl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_ContractTerm_jucn4erQJnXcty2wPoNNzB
133133

134134
epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_DirectAwardTerm_DDmVKAr2D9d2R9YAz7bPSt
135135
a epo:DirectAwardTerm;
136-
epo:hasJustification "unpublished"@de .
136+
epo:hasJustification "unpublished"@de;
137+
epo:refersToPreviousProcedure epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_Procedure_DDmVKAr2D9d2R9YAz7bPSt .
137138

138139
epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_DynamicPurchaseSystemTechnicalUsage_Q4h2gSzyXb646JqueyB5tR
139140
a epo:DynamicPurchaseSystemTechnique;
@@ -330,6 +331,8 @@ epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_Procedure_6dcsBnuV4FTNoRpTZHckqN a e
330331
dct:title "Schnittstelle KIS Medico / PDMS Copra"@de;
331332
adms:identifier epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_ProcedureIdentifier_6dcsBnuV4FTNoRpTZHckqN .
332333

334+
epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_Procedure_DDmVKAr2D9d2R9YAz7bPSt a epo:Procedure .
335+
333336
epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_ProcurementProcedureInformationProvider_PbuuQVDAP9jvgtF6eprdW2
334337
a epo:ProcurementProcedureInformationProvider;
335338
epo:contextualisedBy epd:id_4fd6d98c-2ab7-4585-82a4-b212f12fddfb_Lot_LOT-0001;

‎mappings/package_eforms_sdk1.10_epo4.0/output/sdk_examples_can-1.10/veat_23/veat_23.ttl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_ContractTerm_jucn4erQJnXcty2wPoNNzB
9292
epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_DirectAwardTerm_DDmVKAr2D9d2R9YAz7bPSt
9393
a epo:DirectAwardTerm;
9494
epo:hasDirectAwardJustification <http://publications.europa.eu/resource/authority/direct-award-justification/exclusive>;
95-
epo:hasJustification "Die Stadtwerke Neckargemünd GmbH (SWN) verfügt über zum Teil alleinige Wasserbezugsrechte, die für die Bereitstellung des Trinkwassers zur Versorgung der Stadt Neckargemünd erforderlich sind und über die kein potentieller Wettbewerber verfügt. Denn diese Wasserbezugsrechte sind satzungsrechtlich mit der Mitgliedschaft der SWN in den Zweckverbänden Bodensee-Wasserversorgung und Unteres Elsenztal verknüpft. Mitglied der Zweckverbände ist allein die SWN, nicht die Stadt Neckargemünd, so dass auch keine (auf die Dauer des Konzessionsvertrags befristete) Übertragung dieser Rechte von der Stadt auf das Wasserversorgungsunternehmen möglich ist. Die Rechte stehen allein der SWN kraft ihrer eigenen Mitgliedschaft zu."@de .
95+
epo:hasJustification "Die Stadtwerke Neckargemünd GmbH (SWN) verfügt über zum Teil alleinige Wasserbezugsrechte, die für die Bereitstellung des Trinkwassers zur Versorgung der Stadt Neckargemünd erforderlich sind und über die kein potentieller Wettbewerber verfügt. Denn diese Wasserbezugsrechte sind satzungsrechtlich mit der Mitgliedschaft der SWN in den Zweckverbänden Bodensee-Wasserversorgung und Unteres Elsenztal verknüpft. Mitglied der Zweckverbände ist allein die SWN, nicht die Stadt Neckargemünd, so dass auch keine (auf die Dauer des Konzessionsvertrags befristete) Übertragung dieser Rechte von der Stadt auf das Wasserversorgungsunternehmen möglich ist. Die Rechte stehen allein der SWN kraft ihrer eigenen Mitgliedschaft zu."@de;
96+
epo:refersToPreviousProcedure epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_Procedure_DDmVKAr2D9d2R9YAz7bPSt .
9697

9798
epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_DynamicPurchaseSystemTechnicalUsage_Q4h2gSzyXb646JqueyB5tR
9899
a epo:DynamicPurchaseSystemTechnique .
@@ -232,6 +233,8 @@ epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_Procedure_6dcsBnuV4FTNoRpTZHckqN a e
232233
dct:title "Wasser-Konzessionsvertrag und Löschwasservereinbarung"@de;
233234
adms:identifier epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_ProcedureIdentifier_6dcsBnuV4FTNoRpTZHckqN .
234235

236+
epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_Procedure_DDmVKAr2D9d2R9YAz7bPSt a epo:Procedure .
237+
235238
epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_ProcurementProcedureInformationProvider_HGvue6GtAm3yppLpDLnBKD
236239
a epo:ProcurementProcedureInformationProvider;
237240
epo:contextualisedBy epd:id_9938e0b2-bba7-4123-b96b-a654440660bf_Lot_LOT-0000;

‎mappings/package_eforms_sdk1.10_epo4.0/output/sdk_examples_can-1.10/veat_24/veat_24.ttl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_DirectAwardTerm_DDmVKAr2D9d2R9YAz7bP
153153
(ii) the modification does not alter the overall nature of the contract;
154154
(iii) any increase in price does not exceed 50 % of the value of the original contract or framework agreement.
155155
The Council has relied on Regulation 72(1)(c) and is extending the current contract for a period of 6 months until 31 March 2021 and anticipates re-procuring the service and a new contract being in place as from 1 April 2021.
156-
The extension of 6 months has been limited to what is absolutely necessary to address the unforeseeable circumstance."""@en .
156+
The extension of 6 months has been limited to what is absolutely necessary to address the unforeseeable circumstance."""@en;
157+
epo:refersToPreviousProcedure epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_Procedure_DDmVKAr2D9d2R9YAz7bPSt .
157158

158159
epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_DynamicPurchaseSystemTechnicalUsage_Q4h2gSzyXb646JqueyB5tR
159160
a epo:DynamicPurchaseSystemTechnique .
@@ -378,6 +379,8 @@ epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_Procedure_6dcsBnuV4FTNoRpTZHckqN a e
378379
dct:title "Supply of Profiling Beds with Accessories, Pressure Relieving Mattresses and Cushions"@en;
379380
adms:identifier epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_ProcedureIdentifier_6dcsBnuV4FTNoRpTZHckqN .
380381

382+
epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_Procedure_DDmVKAr2D9d2R9YAz7bPSt a epo:Procedure .
383+
381384
epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_ProcurementProjectContractTerm_BAFiQAm5eaBz7sDFPbYXor
382385
a epo:ContractTerm;
383386
epo:definesSpecificPlaceOfPerformance epd:id_6ea164b2-228c-4ae8-b3b5-26f3946b8300_ContractLocation_Ts6NbgWz9wKHX3CqwnxxzK;

‎mappings/package_eforms_sdk1.10_epo4.0/output/sdk_examples_can-1.10/veat_25/veat_25.ttl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_ContractTerm_jucn4erQJnXcty2wPoNNzB
121121
epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_DirectAwardTerm_DDmVKAr2D9d2R9YAz7bPSt
122122
a epo:DirectAwardTerm;
123123
epo:hasDirectAwardJustification <http://publications.europa.eu/resource/authority/direct-award-justification/exclusive>;
124-
epo:hasJustification "Network Rail Infrastructure Ltd (‘NR’) intends to place a contract with the Dreicher and Sohne, Morris Line Engineering and SDCEM Ltd to source remote securing capability to disconnectors fitted across the railway. Competition is absent due to intellectual property rights, compatibility and warranty considerations for the disconnectors already fitted across the network. It is considered that this contract can be placed using the Negotiated Procurement Without Prior Publication pursuant to Article 50 (c) (iii) of Directive 2014/25/EU of the European Parliament and of the Council (Regulation 50 (1) (c) (iii) of the UK Utilities Contracts Regulations 2016) on the basis that the contract may be awarded only to these aforementioned suppliers. The value of the contract is GBP 5 640 000. Please note that this is a voluntary transparency notice and the contracts have not yet been awarded."@en .
124+
epo:hasJustification "Network Rail Infrastructure Ltd (‘NR’) intends to place a contract with the Dreicher and Sohne, Morris Line Engineering and SDCEM Ltd to source remote securing capability to disconnectors fitted across the railway. Competition is absent due to intellectual property rights, compatibility and warranty considerations for the disconnectors already fitted across the network. It is considered that this contract can be placed using the Negotiated Procurement Without Prior Publication pursuant to Article 50 (c) (iii) of Directive 2014/25/EU of the European Parliament and of the Council (Regulation 50 (1) (c) (iii) of the UK Utilities Contracts Regulations 2016) on the basis that the contract may be awarded only to these aforementioned suppliers. The value of the contract is GBP 5 640 000. Please note that this is a voluntary transparency notice and the contracts have not yet been awarded."@en;
125+
epo:refersToPreviousProcedure epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_Procedure_DDmVKAr2D9d2R9YAz7bPSt .
125126

126127
epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_DynamicPurchaseSystemTechnicalUsage_Q4h2gSzyXb646JqueyB5tR
127128
a epo:DynamicPurchaseSystemTechnique .
@@ -310,6 +311,8 @@ epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_Procedure_6dcsBnuV4FTNoRpTZHckqN a e
310311
dct:title "5,640,000"@en;
311312
adms:identifier epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_ProcedureIdentifier_6dcsBnuV4FTNoRpTZHckqN .
312313

314+
epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_Procedure_DDmVKAr2D9d2R9YAz7bPSt a epo:Procedure .
315+
313316
epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_ProcurementProcedureInformationProvider_HGvue6GtAm3yppLpDLnBKD
314317
a epo:ProcurementProcedureInformationProvider;
315318
epo:contextualisedBy epd:id_b9762d53-76dc-427b-9eb8-68e330f854f1_Lot_LOT-0000;

‎mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/Lot.rml.ttl‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
281281
rr:parentTriplesMap tedm:MG-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpening ;
282282
rr:joinCondition [
283283
rr:child "path(.)";
284-
rr:parent "path(../..)";
284+
rr:parent "path(../../.)";
285285
];
286286
] ;
287287
];
@@ -1819,8 +1819,8 @@ tedm:MG-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpening a rr:Triples
18191819
[
18201820
rr:parentTriplesMap tedm:MG-Address-definesOpeningPlace-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpeningPlace ;
18211821
rr:joinCondition[
1822-
rr:child "path()";
1823-
rr:parent "path(..)"
1822+
rr:child "path(..)";
1823+
rr:parent "path(../..)"
18241824
];
18251825
] ;
18261826
]
@@ -2070,17 +2070,13 @@ tedm:MG-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
20702070
rr:predicateObjectMap
20712071
[
20722072
rdfs:label "BT-5010-Lot";
2073-
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
2073+
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
20742074
rr:predicate adms:identifier ;
20752075
rr:objectMap
20762076
[
2077-
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding ;
2078-
rr:joinCondition [
2079-
rr:child "path()" ;
2080-
rr:parent "path()" ;
2081-
] ;
2077+
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding;
20822078
] ;
2083-
] ;
2079+
];
20842080
.
20852081

20862082
tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
@@ -2101,7 +2097,7 @@ tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
21012097
[
21022098
tedm:minSDKVersion "1.9.1" ;
21032099
rdfs:label "BT-5010-Lot";
2104-
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
2100+
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
21052101
rr:predicate skos:notation ;
21062102
rr:objectMap
21072103
[

‎mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/LotAwardOutcome-can.rml.ttl‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ tedm:MG-LotAwardOutcome_ND-LotResultTenderReference a rr:TriplesMap ;
247247
] ;
248248
.
249249

250-
tedm:MG-LotAwardOutcome_ND-StrategicProcurementLotResult a rr:TriplesMap ;
250+
tedm:MG-LotAwardOutcome_ND-StrategicProcurementLotResult a rr:TriplesMap ;
251251
rdfs:label "MG-LotAwardOutcome";
252252
rml:logicalSource
253253
[
@@ -267,7 +267,7 @@ tedm:MG-LotAwardOutcome_ND-StrategicProcurementLotResult a rr:TriplesMap ;
267267
rr:predicate rdfs:seeAlso ;
268268
rr:objectMap
269269
[
270-
rr:parentTriplesMap tedm:MG-VehicleInformation_ND-StrategicProcurementInformationLotResult ;
270+
rr:parentTriplesMap tedm:MG-VehicleInformation-seeAlso-LotAwardOutcome_ND-StrategicProcurementInformationLotResult ;
271271
rr:joinCondition [
272272
rr:child "path(.)";
273273
rr:parent "path(.)"
@@ -276,32 +276,19 @@ tedm:MG-LotAwardOutcome_ND-StrategicProcurementLotResult a rr:TriplesMap ;
276276
] ;
277277
.
278278

279-
tedm:MG-LotAwardOutcome_ND-ProcurementDetailsLotResult a rr:TriplesMap ;
280-
rdfs:label "MG-LotAwardOutcome";
279+
tedm:MG-VehicleInformation-seeAlso-LotAwardOutcome_ND-StrategicProcurementInformationLotResult a rr:TriplesMap ;
280+
rdfs:label "MG-VehicleInformation";
281281
rml:logicalSource
282282
[
283283
rml:source "data/source.xml" ;
284-
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails" ;
284+
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation" ;
285285
rml:referenceFormulation ql:XPath
286286
] ;
287287
rr:subjectMap
288288
[
289-
rdfs:label "ND-ProcurementDetailsLotResult" ;
290-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_LotAwardOutcome_{../../../cbc:ID}" ;
291-
rr:class epo:LotAwardOutcome
292-
] ;
293-
rr:predicateObjectMap
294-
[
295-
rdfs:label "ND-ProcurementDetailsLotResult" ;
296-
rr:predicate rdfs:seeAlso ;
297-
rr:objectMap
298-
[
299-
rr:parentTriplesMap tedm:MG-VehicleInformation_ND-ProcurementDetailsLotResult ;
300-
rr:joinCondition [
301-
rr:child "path(.)";
302-
rr:parent "path(.)"
303-
];
304-
] ;
289+
rdfs:label "ND-ProcurementStatistics" ;
290+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_VehicleInformation_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
291+
rr:class epo:VehicleInformation
305292
] ;
306293
.
307294

‎mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/LotGroupAwardInformation-can.rml.ttl‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,25 @@ tedm:MG-MonetaryValue-hasGroupFrameworkAgreementMaximumValue-LotGroupAwardInform
4949
rr:datatype xsd:decimal ;
5050
] ;
5151
] ;
52+
rr:predicateObjectMap
53+
[
54+
rr:predicate epo:hasCurrency ;
55+
rr:objectMap
56+
[
57+
rml:reference "cbc:EstimatedOverallContractAmount/@currencyID";
58+
] ;
59+
];
5260
rr:predicateObjectMap
5361
[
54-
rdfs:label "BT-156-NoticeResult";
55-
rdfs:comment "Currency of Group Framework Maximum Value of MG-MonetaryValue under ND-NoticeResultGroupFA";
5662
rr:predicate epo:hasCurrency ;
5763
rr:objectMap
5864
[
59-
rdfs:label "at-voc:currency" ;
60-
rr:parentTriplesMap tedm:currency ;
61-
rr:joinCondition [
62-
rr:child "efbc:GroupFrameworkMaximumValueAmount/@currencyID" ;
63-
rr:parent "code.value" ;
64-
] ;
65+
rml:reference "efbc:GroupFrameworkMaximumValueAmount/@currencyID";
6566
] ;
66-
] ;
67+
]
6768
.
6869

69-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
70+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7071
rdfs:label "MG-LotGroupAwardInformation";
7172
rml:logicalSource
7273
[

0 commit comments

Comments
 (0)