Skip to content

Commit 4e76b0b

Browse files
schivmeisterschivmeister
authored
Merge pull request #140 from OP-TED/feature/TEDSWS-320_selection-criterion
[TEDSWS-320] Fix SelectionCriterion mapping for weight predicates in CN v1.3-1.8 and 1.9+
2 parents 63fc8b4 + 4ff38be commit 4e76b0b

File tree

25 files changed

+750
-179
lines changed

25 files changed

+750
-179
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -439,19 +439,6 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
439439
];
440440
] ;
441441
];
442-
rr:predicateObjectMap
443-
[
444-
rdfs:label "BT-7532-Lot and BT-752-Lot-ThresholdNumber";
445-
rr:predicate epo:specifiesProcurementCriterion;
446-
rr:objectMap
447-
[
448-
rr:parentTriplesMap tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteria ;
449-
rr:joinCondition [
450-
rr:child "path(.)";
451-
rr:parent "path(../../../../../..)";
452-
];
453-
] ;
454-
];
455442
rr:predicateObjectMap
456443
[
457444
rdfs:label "BT-539-Lot, BT-540-Lot and BT-734-Lot";

‎mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/Lot_v1.9+.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
2828
rr:predicateObjectMap
2929
[
30-
rdfs:label "BT-752-Lot-WeightNumber";
30+
rdfs:label "BT-7531-Lot, BT-752-Lot-WeightNumber";
3131
rr:predicate epo:specifiesProcurementCriterion;
3232
rr:objectMap
3333
[
@@ -160,7 +160,7 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SecondStageWeigh
160160
rr:subjectMap
161161
[
162162
rdfs:label "ND-SecondStageWeightCriterionParameter";
163-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
163+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
164164
rr:class epo:SelectionCriterion
165165
] ;
166166
rr:predicateObjectMap

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -439,19 +439,6 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
439439
];
440440
] ;
441441
];
442-
rr:predicateObjectMap
443-
[
444-
rdfs:label "BT-7532-Lot and BT-752-Lot-ThresholdNumber";
445-
rr:predicate epo:specifiesProcurementCriterion;
446-
rr:objectMap
447-
[
448-
rr:parentTriplesMap tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteria ;
449-
rr:joinCondition [
450-
rr:child "path(.)";
451-
rr:parent "path(../../../../../..)";
452-
];
453-
] ;
454-
];
455442
rr:predicateObjectMap
456443
[
457444
rdfs:label "BT-539-Lot, BT-540-Lot and BT-734-Lot";

‎mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/Lot_v1.9+.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
2828
rr:predicateObjectMap
2929
[
30-
rdfs:label "BT-752-Lot-WeightNumber";
30+
rdfs:label "BT-7531-Lot, BT-752-Lot-WeightNumber";
3131
rr:predicate epo:specifiesProcurementCriterion;
3232
rr:objectMap
3333
[
@@ -160,7 +160,7 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SecondStageWeigh
160160
rr:subjectMap
161161
[
162162
rdfs:label "ND-SecondStageWeightCriterionParameter";
163-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
163+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
164164
rr:class epo:SelectionCriterion
165165
] ;
166166
rr:predicateObjectMap

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -439,19 +439,6 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
439439
];
440440
] ;
441441
];
442-
rr:predicateObjectMap
443-
[
444-
rdfs:label "BT-7532-Lot and BT-752-Lot-ThresholdNumber";
445-
rr:predicate epo:specifiesProcurementCriterion;
446-
rr:objectMap
447-
[
448-
rr:parentTriplesMap tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteria ;
449-
rr:joinCondition [
450-
rr:child "path(.)";
451-
rr:parent "path(../../../../../..)";
452-
];
453-
] ;
454-
];
455442
rr:predicateObjectMap
456443
[
457444
rdfs:label "BT-539-Lot, BT-540-Lot and BT-734-Lot";

‎mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/Lot_v1.9+.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
2828
rr:predicateObjectMap
2929
[
30-
rdfs:label "BT-752-Lot-WeightNumber";
30+
rdfs:label "BT-7531-Lot, BT-752-Lot-WeightNumber";
3131
rr:predicate epo:specifiesProcurementCriterion;
3232
rr:objectMap
3333
[
@@ -160,7 +160,7 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SecondStageWeigh
160160
rr:subjectMap
161161
[
162162
rdfs:label "ND-SecondStageWeightCriterionParameter";
163-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
163+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
164164
rr:class epo:SelectionCriterion
165165
] ;
166166
rr:predicateObjectMap

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -439,19 +439,6 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
439439
];
440440
] ;
441441
];
442-
rr:predicateObjectMap
443-
[
444-
rdfs:label "BT-7532-Lot and BT-752-Lot-ThresholdNumber";
445-
rr:predicate epo:specifiesProcurementCriterion;
446-
rr:objectMap
447-
[
448-
rr:parentTriplesMap tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteria ;
449-
rr:joinCondition [
450-
rr:child "path(.)";
451-
rr:parent "path(../../../../../..)";
452-
];
453-
] ;
454-
];
455442
rr:predicateObjectMap
456443
[
457444
rdfs:label "BT-539-Lot, BT-540-Lot and BT-734-Lot";

‎mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/Lot_v1.9+.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
2828
rr:predicateObjectMap
2929
[
30-
rdfs:label "BT-752-Lot-WeightNumber";
30+
rdfs:label "BT-7531-Lot, BT-752-Lot-WeightNumber";
3131
rr:predicate epo:specifiesProcurementCriterion;
3232
rr:objectMap
3333
[
@@ -160,7 +160,7 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SecondStageWeigh
160160
rr:subjectMap
161161
[
162162
rdfs:label "ND-SecondStageWeightCriterionParameter";
163-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
163+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
164164
rr:class epo:SelectionCriterion
165165
] ;
166166
rr:predicateObjectMap

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -439,19 +439,6 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
439439
];
440440
] ;
441441
];
442-
rr:predicateObjectMap
443-
[
444-
rdfs:label "BT-7532-Lot and BT-752-Lot-ThresholdNumber";
445-
rr:predicate epo:specifiesProcurementCriterion;
446-
rr:objectMap
447-
[
448-
rr:parentTriplesMap tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteria ;
449-
rr:joinCondition [
450-
rr:child "path(.)";
451-
rr:parent "path(../../../../../..)";
452-
];
453-
] ;
454-
];
455442
rr:predicateObjectMap
456443
[
457444
rdfs:label "BT-539-Lot, BT-540-Lot and BT-734-Lot";

‎mappings/package_eforms_sdk1.3_epo4.0/transformation/mappings/Lot_v1.3-1.8.rml.ttl‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,21 @@
2424
@prefix fno: <https://w3id.org/function/ontology#> .
2525
@prefix idlab-fn: <http://example.com/idlab/function/> .
2626

27+
tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
28+
rr:predicateObjectMap
29+
[
30+
rdfs:label "BT-7532-Lot and BT-752-Lot-ThresholdNumber";
31+
rr:predicate epo:specifiesProcurementCriterion;
32+
rr:objectMap
33+
[
34+
rr:parentTriplesMap tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SecondStageCriterionParameter ;
35+
rr:joinCondition [
36+
rr:child "path(.)" ;
37+
rr:parent "path(../../../../../../..)" ;
38+
] ;
39+
] ;
40+
] ;
41+
.
2742
tedm:MG-SubcontractTerm-foreseesContractSpecificTerm-Lot_ND-SubcontractingObligation a rr:TriplesMap ;
2843
rml:logicalSource
2944
[
@@ -75,8 +90,21 @@ tedm:MG-SubcontractTerm-foreseesContractSpecificTerm-Lot_ND-SubcontractingObliga
7590
]
7691
.
7792

78-
tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteria a rr:TriplesMap ;
79-
rr:predicateObjectMap
93+
tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SecondStageCriterionParameter a rr:TriplesMap ;
94+
rdfs:label "MG-SelectionCriterion" ;
95+
rml:logicalSource
96+
[
97+
rml:source "data/source.xml" ;
98+
rml:iterator "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter" ;
99+
rml:referenceFormulation ql:XPath
100+
];
101+
rr:subjectMap
102+
[
103+
rdfs:label "ND-SecondStageCriterionParameter" ;
104+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_SelectionCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
105+
rr:class epo:SelectionCriterion
106+
] ;
107+
rr:predicateObjectMap
80108
[
81109
rdfs:label "BT-7532-Lot, BT-752-Lot (threshold)";
82110
rr:predicate epo:hasConstraint ;
@@ -85,7 +113,7 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteri
85113
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SecondStageCriterionParameter ;
86114
rr:joinCondition [
87115
rr:child "path(.)";
88-
rr:parent "path(..)";
116+
rr:parent "path(.)";
89117
];
90118
] ;
91119
];
@@ -98,7 +126,7 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteri
98126
[
99127
tedm:minSDKVersion "1.3" ;
100128
tedm:maxSDKVersion "1.8" ;
101-
rdfs:label ":at-voc:number-weight" ;
129+
rdfs:label "at-voc:number-weight" ;
102130
rr:parentTriplesMap tedm:number-weight ;
103131
rr:joinCondition [
104132
rr:child "efbc:ParameterCode[@listName='number-weight']" ;

0 commit comments

Comments
 (0)