Skip to content

Commit 89132d7

Browse files
schivmeisterschivmeister
authored
Merge pull request #161 from OP-TED/feature/TEDSWS-369/TED9-56_awardcriterion-constraint
Missing AwardCriterion threshold Constraint linkage
2 parents cb22860 + 195396f commit 89132d7

22 files changed

Lines changed: 847 additions & 363 deletions

File tree

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

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -285,19 +285,6 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
285285
];
286286
] ;
287287
];
288-
rr:predicateObjectMap
289-
[
290-
rdfs:label "BT-133-Lot";
291-
rr:predicate epo:isSubjectToLotSpecificTerm ;
292-
rr:objectMap
293-
[
294-
rr:parentTriplesMap tedm:MG-Address-definesOpeningPlace-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpeningPlace;
295-
rr:joinCondition [
296-
rr:child "path(.)";
297-
rr:parent "path(../../.)";
298-
];
299-
] ;
300-
];
301288
rr:predicateObjectMap
302289
[
303290
rdfs:label "BT-17-Lot";
@@ -454,7 +441,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
454441
];
455442
rr:predicateObjectMap
456443
[
457-
rdfs:label "BT-5421 and BT-541";
444+
rdfs:label "BT-5421-Lot and BT-541-Lot-WeightNumber";
458445
rr:predicate epo:specifiesProcurementCriterion;
459446
rr:objectMap
460447
[
@@ -465,13 +452,26 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
465452
];
466453
] ;
467454
];
455+
rr:predicateObjectMap
456+
[
457+
rdfs:label "BT-5423-Lot and BT-541-Lot-ThresholdNumber";
458+
rr:predicate epo:specifiesProcurementCriterion;
459+
rr:objectMap
460+
[
461+
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter;
462+
rr:joinCondition [
463+
rr:child "path(.)";
464+
rr:parent "path(../../../../../../../../..)";
465+
];
466+
] ;
467+
];
468468
rr:predicateObjectMap
469469
[
470470
rdfs:label "BT-5422-Lot and BT-541-Lot-FixedNumber";
471471
rr:predicate epo:specifiesProcurementCriterion;
472472
rr:objectMap
473473
[
474-
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardWeightCriterionParameter;
474+
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardFixedCriterionParameter;
475475
rr:joinCondition [
476476
rr:child "path(.)";
477477
rr:parent "path(../../../../../../../../..)";
@@ -2217,20 +2217,6 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteri
22172217
rr:datatype xsd:boolean;
22182218
] ;
22192219
];
2220-
rr:predicateObjectMap
2221-
[
2222-
rdfs:label "BT-5423-Lot,BT-541-Lot-ThresholdNumber" ;
2223-
rr:predicate epo:hasConstraint ;
2224-
rr:objectMap
2225-
[
2226-
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter ;
2227-
rr:joinCondition [
2228-
rr:child "path(.)";
2229-
rr:parent "path(../../../../../../../../..)" ;
2230-
];
2231-
] ;
2232-
]
2233-
22342220
.
22352221

22362222
tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardCriterion a rr:TriplesMap ;
@@ -2359,6 +2345,35 @@ tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardWeightCriter
23592345
] ;
23602346
.
23612347

2348+
tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter a rr:TriplesMap ;
2349+
rdfs:label "MG-AwardCriterion";
2350+
rml:logicalSource
2351+
[
2352+
rml:source "data/source.xml" ;
2353+
rml:iterator "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']";
2354+
rml:referenceFormulation ql:XPath
2355+
];
2356+
rr:subjectMap
2357+
[
2358+
rdfs:label "ND-LotAwardThresholdCriterionParameter";
2359+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AwardCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(../../../../..)) || '?response_type=raw')}" ;
2360+
rr:class epo:AwardCriterion
2361+
] ;
2362+
rr:predicateObjectMap
2363+
[
2364+
rdfs:label "BT-5423-Lot,BT-541-Lot-ThresholdNumber" ;
2365+
rr:predicate epo:hasConstraint ;
2366+
rr:objectMap
2367+
[
2368+
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter ;
2369+
rr:joinCondition [
2370+
rr:child "path(.)";
2371+
rr:parent "path(.)" ;
2372+
];
2373+
] ;
2374+
];
2375+
.
2376+
23622377
tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardFixedCriterionParameter a rr:TriplesMap ;
23632378
rdfs:label "MG-AwardCriterion";
23642379
rml:logicalSource

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

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ tedm:MG-LotGroup_ND-LotsGroup a rr:TriplesMap ;
130130
rr:predicateObjectMap
131131
[
132132
rdfs:label "BT-5421-LotsGroup-FixedNumber";
133-
rr:predicate epo:specifiesProcurementCriterion ;
133+
rr:predicate epo:specifiesProcurementCriterion ;
134134
rr:objectMap
135135
[
136136
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardFixedCriterionParameter ;
@@ -142,11 +142,11 @@ tedm:MG-LotGroup_ND-LotsGroup a rr:TriplesMap ;
142142
] ;
143143
rr:predicateObjectMap
144144
[
145-
rdfs:label "BT-5423-LotsGroup, BT-541-LotsGroup-ThresholdNumber";
146-
rr:predicate epo:hasConstraint ;
145+
rdfs:label "BT-5423-LotsGroup and BT-541-LotsGroup-ThresholdNumber" ;
146+
rr:predicate epo:specifiesProcurementCriterion ;
147147
rr:objectMap
148148
[
149-
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter;
149+
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter ;
150150
rr:joinCondition [
151151
rr:child "path(.)";
152152
rr:parent "path(../../../../../../../../..)";
@@ -588,6 +588,35 @@ tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardW
588588
] ;
589589
.
590590

591+
tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter a rr:TriplesMap ;
592+
rdfs:label "MG-AwardCriterion" ;
593+
rml:logicalSource
594+
[
595+
rml:source "data/source.xml" ;
596+
rml:iterator "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='LotsGroup']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']" ;
597+
rml:referenceFormulation ql:XPath
598+
] ;
599+
rr:subjectMap
600+
[
601+
rdfs:label "ND-LotsGroupAwardThresholdCriterionParameter" ;
602+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_LotGroupAwardCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(../../../../..)) || '?response_type=raw')}" ;
603+
rr:class epo:AwardCriterion
604+
] ;
605+
rr:predicateObjectMap
606+
[
607+
rdfs:label "BT-5423-LotsGroup and BT-541-LotsGroup-ThresholdNumber" ;
608+
rr:predicate epo:hasConstraint ;
609+
rr:objectMap
610+
[
611+
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter ;
612+
rr:joinCondition [
613+
rr:child "path(.)" ;
614+
rr:parent "path(.)" ;
615+
] ;
616+
] ;
617+
] ;
618+
.
619+
591620
tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter a rr:TriplesMap ;
592621
rdfs:label "MG-Constraint";
593622
rml:logicalSource

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

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -285,19 +285,6 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
285285
];
286286
] ;
287287
];
288-
rr:predicateObjectMap
289-
[
290-
rdfs:label "BT-133-Lot";
291-
rr:predicate epo:isSubjectToLotSpecificTerm ;
292-
rr:objectMap
293-
[
294-
rr:parentTriplesMap tedm:MG-Address-definesOpeningPlace-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpeningPlace;
295-
rr:joinCondition [
296-
rr:child "path(.)";
297-
rr:parent "path(../../.)";
298-
];
299-
] ;
300-
];
301288
rr:predicateObjectMap
302289
[
303290
rdfs:label "BT-17-Lot";
@@ -454,7 +441,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
454441
];
455442
rr:predicateObjectMap
456443
[
457-
rdfs:label "BT-5421 and BT-541";
444+
rdfs:label "BT-5421-Lot and BT-541-Lot-WeightNumber";
458445
rr:predicate epo:specifiesProcurementCriterion;
459446
rr:objectMap
460447
[
@@ -465,13 +452,26 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
465452
];
466453
] ;
467454
];
455+
rr:predicateObjectMap
456+
[
457+
rdfs:label "BT-5423-Lot and BT-541-Lot-ThresholdNumber";
458+
rr:predicate epo:specifiesProcurementCriterion;
459+
rr:objectMap
460+
[
461+
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter;
462+
rr:joinCondition [
463+
rr:child "path(.)";
464+
rr:parent "path(../../../../../../../../..)";
465+
];
466+
] ;
467+
];
468468
rr:predicateObjectMap
469469
[
470470
rdfs:label "BT-5422-Lot and BT-541-Lot-FixedNumber";
471471
rr:predicate epo:specifiesProcurementCriterion;
472472
rr:objectMap
473473
[
474-
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardWeightCriterionParameter;
474+
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardFixedCriterionParameter;
475475
rr:joinCondition [
476476
rr:child "path(.)";
477477
rr:parent "path(../../../../../../../../..)";
@@ -2217,20 +2217,6 @@ tedm:MG-SelectionCriterion-specifiesProcurementCriterion-Lot_ND-SelectionCriteri
22172217
rr:datatype xsd:boolean;
22182218
] ;
22192219
];
2220-
rr:predicateObjectMap
2221-
[
2222-
rdfs:label "BT-5423-Lot,BT-541-Lot-ThresholdNumber" ;
2223-
rr:predicate epo:hasConstraint ;
2224-
rr:objectMap
2225-
[
2226-
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter ;
2227-
rr:joinCondition [
2228-
rr:child "path(.)";
2229-
rr:parent "path(../../../../../../../../..)" ;
2230-
];
2231-
] ;
2232-
]
2233-
22342220
.
22352221

22362222
tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardCriterion a rr:TriplesMap ;
@@ -2359,6 +2345,35 @@ tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardWeightCriter
23592345
] ;
23602346
.
23612347

2348+
tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter a rr:TriplesMap ;
2349+
rdfs:label "MG-AwardCriterion";
2350+
rml:logicalSource
2351+
[
2352+
rml:source "data/source.xml" ;
2353+
rml:iterator "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']";
2354+
rml:referenceFormulation ql:XPath
2355+
];
2356+
rr:subjectMap
2357+
[
2358+
rdfs:label "ND-LotAwardThresholdCriterionParameter";
2359+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_AwardCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(../../../../..)) || '?response_type=raw')}" ;
2360+
rr:class epo:AwardCriterion
2361+
] ;
2362+
rr:predicateObjectMap
2363+
[
2364+
rdfs:label "BT-5423-Lot,BT-541-Lot-ThresholdNumber" ;
2365+
rr:predicate epo:hasConstraint ;
2366+
rr:objectMap
2367+
[
2368+
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardThresholdCriterionParameter ;
2369+
rr:joinCondition [
2370+
rr:child "path(.)";
2371+
rr:parent "path(.)" ;
2372+
];
2373+
] ;
2374+
];
2375+
.
2376+
23622377
tedm:MG-AwardCriterion-specifiesProcurementCriterion-Lot_ND-LotAwardFixedCriterionParameter a rr:TriplesMap ;
23632378
rdfs:label "MG-AwardCriterion";
23642379
rml:logicalSource

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

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ tedm:MG-LotGroup_ND-LotsGroup a rr:TriplesMap ;
130130
rr:predicateObjectMap
131131
[
132132
rdfs:label "BT-5421-LotsGroup-FixedNumber";
133-
rr:predicate epo:specifiesProcurementCriterion ;
133+
rr:predicate epo:specifiesProcurementCriterion ;
134134
rr:objectMap
135135
[
136136
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardFixedCriterionParameter ;
@@ -142,11 +142,11 @@ tedm:MG-LotGroup_ND-LotsGroup a rr:TriplesMap ;
142142
] ;
143143
rr:predicateObjectMap
144144
[
145-
rdfs:label "BT-5423-LotsGroup, BT-541-LotsGroup-ThresholdNumber";
146-
rr:predicate epo:hasConstraint ;
145+
rdfs:label "BT-5423-LotsGroup and BT-541-LotsGroup-ThresholdNumber" ;
146+
rr:predicate epo:specifiesProcurementCriterion ;
147147
rr:objectMap
148148
[
149-
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter;
149+
rr:parentTriplesMap tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter ;
150150
rr:joinCondition [
151151
rr:child "path(.)";
152152
rr:parent "path(../../../../../../../../..)";
@@ -588,6 +588,35 @@ tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardW
588588
] ;
589589
.
590590

591+
tedm:MG-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter a rr:TriplesMap ;
592+
rdfs:label "MG-AwardCriterion" ;
593+
rml:logicalSource
594+
[
595+
rml:source "data/source.xml" ;
596+
rml:iterator "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='LotsGroup']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']" ;
597+
rml:referenceFormulation ql:XPath
598+
] ;
599+
rr:subjectMap
600+
[
601+
rdfs:label "ND-LotsGroupAwardThresholdCriterionParameter" ;
602+
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_LotGroupAwardCriterion_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(../../../../..)) || '?response_type=raw')}" ;
603+
rr:class epo:AwardCriterion
604+
] ;
605+
rr:predicateObjectMap
606+
[
607+
rdfs:label "BT-5423-LotsGroup and BT-541-LotsGroup-ThresholdNumber" ;
608+
rr:predicate epo:hasConstraint ;
609+
rr:objectMap
610+
[
611+
rr:parentTriplesMap tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter ;
612+
rr:joinCondition [
613+
rr:child "path(.)" ;
614+
rr:parent "path(.)" ;
615+
] ;
616+
] ;
617+
] ;
618+
.
619+
591620
tedm:MG-Constraint-hasConstraint-AwardCriterion-specifiesProcurementCriterion-LotGroup_ND-LotsGroupAwardThresholdCriterionParameter a rr:TriplesMap ;
592621
rdfs:label "MG-Constraint";
593622
rml:logicalSource

0 commit comments

Comments
 (0)