Skip to content

Commit 56fc010

Browse files
schivmeisterschivmeister
authored
Merge pull request #158 from OP-TED/feature/TEDSWS-369/TED9-39_select-retractions
Select reversals of previously retracted bug fixes
2 parents a5001d6 + f5e83cd commit 56fc010

File tree

90 files changed

+586
-599
lines changed

Some content is hidden

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

90 files changed

+586
-599
lines changed

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

Lines changed: 11 additions & 7 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
];
@@ -1807,8 +1807,8 @@ tedm:MG-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpening a rr:Triples
18071807
[
18081808
rr:parentTriplesMap tedm:MG-Address-definesOpeningPlace-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpeningPlace ;
18091809
rr:joinCondition[
1810-
rr:child "path(..)";
1811-
rr:parent "path(../..)"
1810+
rr:child "path()";
1811+
rr:parent "path(..)"
18121812
];
18131813
] ;
18141814
]
@@ -2058,13 +2058,17 @@ tedm:MG-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
20582058
rr:predicateObjectMap
20592059
[
20602060
rdfs:label "BT-5010-Lot";
2061-
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
2061+
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
20622062
rr:predicate adms:identifier ;
20632063
rr:objectMap
20642064
[
2065-
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding;
2065+
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding ;
2066+
rr:joinCondition [
2067+
rr:child "path()" ;
2068+
rr:parent "path()" ;
2069+
] ;
20662070
] ;
2067-
];
2071+
] ;
20682072
.
20692073

20702074
tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
@@ -2085,7 +2089,7 @@ tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
20852089
[
20862090
tedm:minSDKVersion "1.9.1" ;
20872091
rdfs:label "BT-5010-Lot";
2088-
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
2092+
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
20892093
rr:predicate skos:notation ;
20902094
rr:objectMap
20912095
[

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

Lines changed: 21 additions & 8 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-seeAlso-LotAwardOutcome_ND-StrategicProcurementInformationLotResult ;
270+
rr:parentTriplesMap tedm:MG-VehicleInformation_ND-StrategicProcurementInformationLotResult ;
271271
rr:joinCondition [
272272
rr:child "path(.)";
273273
rr:parent "path(.)"
@@ -276,19 +276,32 @@ tedm:MG-LotAwardOutcome_ND-StrategicProcurementLotResult a rr:TriplesMap ;
276276
] ;
277277
.
278278

279-
tedm:MG-VehicleInformation-seeAlso-LotAwardOutcome_ND-StrategicProcurementInformationLotResult a rr:TriplesMap ;
280-
rdfs:label "MG-VehicleInformation";
279+
tedm:MG-LotAwardOutcome_ND-ProcurementDetailsLotResult a rr:TriplesMap ;
280+
rdfs:label "MG-LotAwardOutcome";
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" ;
284+
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails" ;
285285
rml:referenceFormulation ql:XPath
286286
] ;
287287
rr:subjectMap
288288
[
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
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+
] ;
292305
] ;
293306
.
294307

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,24 @@ 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-
];
6052
rr:predicateObjectMap
6153
[
54+
rdfs:label "BT-156-NoticeResult";
55+
rdfs:comment "Currency of Group Framework Maximum Value of MG-MonetaryValue under ND-NoticeResultGroupFA";
6256
rr:predicate epo:hasCurrency ;
6357
rr:objectMap
6458
[
65-
rml:reference "efbc:GroupFrameworkMaximumValueAmount/@currencyID";
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+
] ;
6665
] ;
67-
]
66+
] ;
6867
.
6968

70-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
69+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7170
rdfs:label "MG-LotGroupAwardInformation";
7271
rml:logicalSource
7372
[

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ tedm:MG-ContractTerm-isSubjectToContractSpecificTerm-Contract_ND-PayerParty a r
3636
[
3737
rdfs:label "ND-PayerParty" ;
3838
rdfs:comment "LotResultTechnicalIdentifier of MG-LotAwardOutcome under ND-LotResult" ;
39-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_ContractTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
39+
rml:reference "if (exists(../../efac:SettledContract/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
4040
rr:class epo:ContractTerm
4141
] ;
4242
rr:predicateObjectMap

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ tedm:MG-Procedure-refersToPreviousProcedure-DirectAwardTerm-isSubjectToProcedure
132132
rr:subjectMap
133133
[
134134
rdfs:label "ND-DirectAward";
135-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Procedure_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
135+
rml:reference "if (exists(cbc:Description)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_Procedure_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
136136
rr:class epo:Procedure
137137
] ;
138138

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ tedm:MG-langString-hasCrossBorderLaw-ProcedureTerm-isSubjectToProcedureSpecificT
14091409
rr:predicateObjectMap [
14101410
rr:predicate epo-not:hasCrossBorderLaw ;
14111411
rr:objectMap [
1412-
rml:reference "." ;
1412+
rml:reference "if(not(exists(ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']) and cbc:DocumentDescription/text() = 'unpublished')) then . else null" ;
14131413
rml:languageMap [
14141414
fnml:functionValue [
14151415
rr:predicateObjectMap [

‎mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/VehicleInformation-can_v1.3-1.12.rml.ttl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#--- MG-VehicleInformation version-specific SDK v0-1.12 ---
1+
#--- MG-VehicleInformation CAN version-specific SDK v0-1.12 ---
22
@prefix owl: <http://www.w3.org/2002/07/owl#> .
33
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
44
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -35,7 +35,7 @@ tedm:MG-VehicleInformation_ND-ProcurementDetailsLotResult a rr:TriplesMap ;
3535
rr:subjectMap
3636
[
3737
rdfs:label "ND-ProcurementDetailsLotResult" ;
38-
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')}" ;
38+
rml:reference "'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(if (exists(../efac:ProcurementDetails[2])) then path() else path(..)) || '?response_type=raw')" ;
3939
rr:class epo:VehicleInformation
4040
] ;
4141
rr:predicateObjectMap
@@ -83,7 +83,7 @@ tedm:MG-VehicleInformation_ND-ProcurementStatistics a rr:TriplesMap ;
8383
rr:subjectMap
8484
[
8585
rdfs:label "ND-ProcurementStatistics" ;
86-
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')}" ;
86+
rml:reference "'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(if (exists(../../efac:ProcurementDetails[2])) then path(..) else path(../..)) || '?response_type=raw')" ;
8787
rr:class epo:VehicleInformation
8888
] ;
8989
rr:predicateObjectMap
@@ -93,7 +93,7 @@ tedm:MG-VehicleInformation_ND-ProcurementStatistics a rr:TriplesMap ;
9393
rr:predicate epo:hasTotalVehicles ;
9494
rr:objectMap
9595
[
96-
rml:reference "if (efbc:StatisticsCode='vehicles')then efbc:StatisticsNumeric else null";
96+
rml:reference "if (efbc:StatisticsCode='vehicles') then efbc:StatisticsNumeric else null";
9797
rr:datatype xsd:integer ;
9898
] ;
9999
];
@@ -104,7 +104,7 @@ tedm:MG-VehicleInformation_ND-ProcurementStatistics a rr:TriplesMap ;
104104
rr:predicate epo:hasCleanVehicles ;
105105
rr:objectMap
106106
[
107-
rml:reference "if (efbc:StatisticsCode='vehicles-clean')then efbc:StatisticsNumeric else null";
107+
rml:reference "if (efbc:StatisticsCode='vehicles-clean') then efbc:StatisticsNumeric else null";
108108
rr:datatype xsd:integer ;
109109
] ;
110110
];
@@ -133,9 +133,9 @@ tedm:MG-VehicleInformation_ND-StrategicProcurementInformationLotResult a rr:Trip
133133
rr:subjectMap
134134
[
135135
rdfs:label "ND-StrategicProcurementInformationLotResult" ;
136-
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')}" ;
136+
rml:reference "if (exists(efbc:ProcurementCategoryCode)) then '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') else null" ;
137137
rr:class epo:VehicleInformation
138-
] ;
138+
] ;
139139
rr:predicateObjectMap
140140
[
141141
rdfs:label "BT-735-LotResult";
@@ -164,5 +164,5 @@ tedm:MG-VehicleInformation_ND-StrategicProcurementInformationLotResult a rr:Trip
164164
rr:parent "path(.)";
165165
];
166166
] ;
167-
] ;
167+
] ;
168168
.

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

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ tedm:MG-Notice_ND-NoticeResult a rr:TriplesMap ;
252252
rr:predicate epo:announcesLotGroupAwardInformation ;
253253
rr:objectMap
254254
[
255-
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
255+
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA ;
256256
rr:joinCondition [
257257
rr:child "path(.)";
258258
rr:parent "path(..)";
@@ -445,22 +445,6 @@ tedm:MG-MonetaryValue-hasApproximateFrameworkAgreementValue-NoticeAwardInformati
445445
] ;
446446
.
447447

448-
tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA a rr:TriplesMap ;
449-
rdfs:label "MG-LotGroupAwardInformation";
450-
rml:logicalSource
451-
[
452-
rml:source "data/source.xml" ;
453-
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework" ;
454-
rml:referenceFormulation ql:XPath
455-
] ;
456-
rr:subjectMap
457-
[
458-
rdfs:label "ND-NoticeResult";
459-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_LotGroupAwardInformation_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
460-
rr:class epo:LotGroupAwardInformation
461-
] ;
462-
.
463-
464448
# these properties are shared among other CAN types such as DAP and cont-modif based on certain conditions
465449
tedm:MG-Notice_ND-LotResult a rr:TriplesMap ;
466450
rdfs:label "MG-Notice" ;

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

Lines changed: 11 additions & 7 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
];
@@ -1807,8 +1807,8 @@ tedm:MG-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpening a rr:Triples
18071807
[
18081808
rr:parentTriplesMap tedm:MG-Address-definesOpeningPlace-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpeningPlace ;
18091809
rr:joinCondition[
1810-
rr:child "path(..)";
1811-
rr:parent "path(../..)"
1810+
rr:child "path()";
1811+
rr:parent "path(..)"
18121812
];
18131813
] ;
18141814
]
@@ -2058,13 +2058,17 @@ tedm:MG-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
20582058
rr:predicateObjectMap
20592059
[
20602060
rdfs:label "BT-5010-Lot";
2061-
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
2061+
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
20622062
rr:predicate adms:identifier ;
20632063
rr:objectMap
20642064
[
2065-
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding;
2065+
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding ;
2066+
rr:joinCondition [
2067+
rr:child "path()" ;
2068+
rr:parent "path()" ;
2069+
] ;
20662070
] ;
2067-
];
2071+
] ;
20682072
.
20692073

20702074
tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
@@ -2085,7 +2089,7 @@ tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
20852089
[
20862090
tedm:minSDKVersion "1.9.1" ;
20872091
rdfs:label "BT-5010-Lot";
2088-
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
2092+
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
20892093
rr:predicate skos:notation ;
20902094
rr:objectMap
20912095
[

0 commit comments

Comments
 (0)