Skip to content

Commit be315d5

Browse files
schivmeisterschivmeister
committed
Fix specific/broad place instantiation for CN, CAN
This affects the eForms fields **BT-727-Lot** and **BT-728-Lot**, where the instantiation of the ContractTerm and in turn the broad and specific places of performance is not optimal, resulting in multiple values being asserted for the properties `epo:hasPlaceOfPerformanceAdditionalInformation` and `epo:definesSpecificPlaceOfPerformance`. This was accounted for during the mapping of the counterpart `-Part` fields (for PIN notices), where the correct mappings were created to avoid this issue. See commit fe7e358 "Fix specific/broad place instantiation, refactor contract terms". However, the issue still persisted in CAN and CN mappings. A guard is placed against `cbc:Region` to avoid creating an address for a broad place. The subject templates for the place of performance's contract is updated to instantiate at the `cbc:RealizedLocation`. This results in separate but harmonized contracts collecting place-related information together. This in turn avoids multiple values being asserted for the additional information and specific place. Fixes gh-151.
1 parent 7ff4d1d commit be315d5

49 files changed

Lines changed: 930 additions & 772 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/transformation/mappings/Lot.rml.ttl‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,19 +3059,6 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotProcurementScope a r
30593059
] ;
30603060
] ;
30613061
];
3062-
rr:predicateObjectMap
3063-
[
3064-
rdfs:label "BT-5101(a)-Lot, BT-5101(b)-Lot, BT-5101(s)-Lot, BT-5131-Lot, BT-5121-Lot, BT-5071-Lot, BT-5141-Lot ";
3065-
rr:predicate epo:definesSpecificPlaceOfPerformance ;
3066-
rr:objectMap
3067-
[
3068-
rr:parentTriplesMap tedm:Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress ;
3069-
rr:joinCondition [
3070-
rr:child "path(.)";
3071-
rr:parent "path(../..)";
3072-
];
3073-
] ;
3074-
] ;
30753062
rr:predicateObjectMap
30763063
[
30773064
rdfs:label "BT-36-Lot (object)";
@@ -4228,7 +4215,7 @@ tedm:MG-StrategicProcurement-fulfillsStrategicProcurement-Lot-Lot_ND-Accessibili
42284215
.
42294216

42304217
tedm:MG-Address-address-Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a rr:TriplesMap ;
4231-
rdfs:label "MG-Address" ;
4218+
rdfs:label "MG-Address" ;
42324219
rml:logicalSource
42334220
[
42344221
rml:source "data/source.xml" ;
@@ -4238,7 +4225,7 @@ tedm:MG-Address-address-Location-definesSpecificPlaceOfPerformance-ContractTerm-
42384225
rr:subjectMap
42394226
[
42404227
rdfs:comment "ND-LotPerformanceAddress";
4241-
rml:reference "if(exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line) or exists(cbc:CityName) or exists(cbc:PostalZone) or exists(cac:Country/cbc:IdentificationCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractLocationAddress_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
4228+
rml:reference "if(not(exists(cbc:Region)) and (exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line) or exists(cbc:CityName) or exists(cbc:PostalZone) or exists(cac:Country/cbc:IdentificationCode))) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractLocationAddress_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
42424229
rr:class locn:Address
42434230
] ;
42444231
rr:predicateObjectMap
@@ -4313,8 +4300,8 @@ tedm:MG-Address-address-Location-definesSpecificPlaceOfPerformance-ContractTerm-
43134300
] ;
43144301
.
43154302

4316-
tedm:Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a rr:TriplesMap ;
4317-
rdfs:label "MG-Location" ;
4303+
tedm:MG-Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a rr:TriplesMap ;
4304+
rdfs:label "MG-Location" ;
43184305
rml:logicalSource
43194306
[
43204307
rml:source "data/source.xml" ;
@@ -4324,7 +4311,8 @@ tedm:Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpe
43244311
rr:subjectMap
43254312
[
43264313
rdfs:label "ND-LotPerformanceAddress" ;
4327-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_ContractLocation_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
4314+
# we check for the elements of a linked Address as otherwise this Location should not be instantiated either
4315+
rml:reference "if(exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line) or exists(cbc:CityName) or exists(cbc:PostalZone) or exists(cac:Country/cbc:IdentificationCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractLocation_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
43284316
rr:class dct:Location
43294317
];
43304318
rr:predicateObjectMap
@@ -4382,7 +4370,7 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a
43824370
rr:subjectMap
43834371
[
43844372
rdfs:label "ND-LotPerformanceAddress";
4385-
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')}";
4373+
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')}";
43864374
rr:class epo:ContractTerm
43874375
] ;
43884376
rr:predicateObjectMap
@@ -4402,6 +4390,19 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a
44024390
] ;
44034391
] ;
44044392
];
4393+
rr:predicateObjectMap
4394+
[
4395+
rdfs:label "BT-5101(a)-Lot, BT-5101(b)-Lot, BT-5101(s)-Lot, BT-5131-Lot, BT-5121-Lot, BT-5071-Lot, BT-5141-Lot " ;
4396+
rr:predicate epo:definesSpecificPlaceOfPerformance ;
4397+
rr:objectMap
4398+
[
4399+
rr:parentTriplesMap tedm:MG-Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress ;
4400+
rr:joinCondition [
4401+
rr:child "path()" ;
4402+
rr:parent "path()" ;
4403+
] ;
4404+
] ;
4405+
] ;
44054406
.
44064407

44074408
tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPlacePerformance a rr:TriplesMap ;
@@ -5393,7 +5394,7 @@ tedm:MG-langString-hasPlaceOfPerformanceAdditionalInformation-ContractTerm-fores
53935394
rr:subjectMap [
53945395
rr:class epo-not:ContractTerm ;
53955396
rdfs:label "ND-LotProcurementScope" ;
5396-
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')}" ;
5397+
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')}" ;
53975398
] ;
53985399
rr:predicateObjectMap [
53995400
rr:predicate epo-not:hasPlaceOfPerformanceAdditionalInformation ;

‎mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/PlannedProcurementPart-pin.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-ProcurementObject-foreseesProc
808808
];
809809
rr:subjectMap
810810
[
811-
rdfs:label "ND-PartProcurementScope" ;
811+
rdfs:label "ND-PartPerformanceAddress" ;
812812
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')}";
813813
rr:class epo:ContractTerm
814814
] ;

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,19 +3059,6 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotProcurementScope a r
30593059
] ;
30603060
] ;
30613061
];
3062-
rr:predicateObjectMap
3063-
[
3064-
rdfs:label "BT-5101(a)-Lot, BT-5101(b)-Lot, BT-5101(s)-Lot, BT-5131-Lot, BT-5121-Lot, BT-5071-Lot, BT-5141-Lot ";
3065-
rr:predicate epo:definesSpecificPlaceOfPerformance ;
3066-
rr:objectMap
3067-
[
3068-
rr:parentTriplesMap tedm:Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress ;
3069-
rr:joinCondition [
3070-
rr:child "path(.)";
3071-
rr:parent "path(../..)";
3072-
];
3073-
] ;
3074-
] ;
30753062
rr:predicateObjectMap
30763063
[
30773064
rdfs:label "BT-36-Lot (object)";
@@ -4228,7 +4215,7 @@ tedm:MG-StrategicProcurement-fulfillsStrategicProcurement-Lot-Lot_ND-Accessibili
42284215
.
42294216

42304217
tedm:MG-Address-address-Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a rr:TriplesMap ;
4231-
rdfs:label "MG-Address" ;
4218+
rdfs:label "MG-Address" ;
42324219
rml:logicalSource
42334220
[
42344221
rml:source "data/source.xml" ;
@@ -4238,7 +4225,7 @@ tedm:MG-Address-address-Location-definesSpecificPlaceOfPerformance-ContractTerm-
42384225
rr:subjectMap
42394226
[
42404227
rdfs:comment "ND-LotPerformanceAddress";
4241-
rml:reference "if(exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line) or exists(cbc:CityName) or exists(cbc:PostalZone) or exists(cac:Country/cbc:IdentificationCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractLocationAddress_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
4228+
rml:reference "if(not(exists(cbc:Region)) and (exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line) or exists(cbc:CityName) or exists(cbc:PostalZone) or exists(cac:Country/cbc:IdentificationCode))) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractLocationAddress_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
42424229
rr:class locn:Address
42434230
] ;
42444231
rr:predicateObjectMap
@@ -4313,8 +4300,8 @@ tedm:MG-Address-address-Location-definesSpecificPlaceOfPerformance-ContractTerm-
43134300
] ;
43144301
.
43154302

4316-
tedm:Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a rr:TriplesMap ;
4317-
rdfs:label "MG-Location" ;
4303+
tedm:MG-Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a rr:TriplesMap ;
4304+
rdfs:label "MG-Location" ;
43184305
rml:logicalSource
43194306
[
43204307
rml:source "data/source.xml" ;
@@ -4324,7 +4311,8 @@ tedm:Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpe
43244311
rr:subjectMap
43254312
[
43264313
rdfs:label "ND-LotPerformanceAddress" ;
4327-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_ContractLocation_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
4314+
# we check for the elements of a linked Address as otherwise this Location should not be instantiated either
4315+
rml:reference "if(exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line) or exists(cbc:CityName) or exists(cbc:PostalZone) or exists(cac:Country/cbc:IdentificationCode)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractLocation_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
43284316
rr:class dct:Location
43294317
];
43304318
rr:predicateObjectMap
@@ -4382,7 +4370,7 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a
43824370
rr:subjectMap
43834371
[
43844372
rdfs:label "ND-LotPerformanceAddress";
4385-
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')}";
4373+
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')}";
43864374
rr:class epo:ContractTerm
43874375
] ;
43884376
rr:predicateObjectMap
@@ -4402,6 +4390,19 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress a
44024390
] ;
44034391
] ;
44044392
];
4393+
rr:predicateObjectMap
4394+
[
4395+
rdfs:label "BT-5101(a)-Lot, BT-5101(b)-Lot, BT-5101(s)-Lot, BT-5131-Lot, BT-5121-Lot, BT-5071-Lot, BT-5141-Lot " ;
4396+
rr:predicate epo:definesSpecificPlaceOfPerformance ;
4397+
rr:objectMap
4398+
[
4399+
rr:parentTriplesMap tedm:MG-Location-definesSpecificPlaceOfPerformance-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPerformanceAddress ;
4400+
rr:joinCondition [
4401+
rr:child "path()" ;
4402+
rr:parent "path()" ;
4403+
] ;
4404+
] ;
4405+
] ;
44054406
.
44064407

44074408
tedm:MG-ContractTerm-foreseesContractSpecificTerm-Lot_ND-LotPlacePerformance a rr:TriplesMap ;
@@ -5393,7 +5394,7 @@ tedm:MG-langString-hasPlaceOfPerformanceAdditionalInformation-ContractTerm-fores
53935394
rr:subjectMap [
53945395
rr:class epo-not:ContractTerm ;
53955396
rdfs:label "ND-LotProcurementScope" ;
5396-
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')}" ;
5397+
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')}" ;
53975398
] ;
53985399
rr:predicateObjectMap [
53995400
rr:predicate epo-not:hasPlaceOfPerformanceAdditionalInformation ;

‎mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/PlannedProcurementPart-pin.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ tedm:MG-ContractTerm-foreseesContractSpecificTerm-ProcurementObject-foreseesProc
808808
];
809809
rr:subjectMap
810810
[
811-
rdfs:label "ND-PartProcurementScope" ;
811+
rdfs:label "ND-PartPerformanceAddress" ;
812812
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')}";
813813
rr:class epo:ContractTerm
814814
] ;

0 commit comments

Comments
 (0)