diff --git a/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.10/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.10/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.10/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.10/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.10/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.10/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.10/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.10/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.10/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.10/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.10/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.10/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.10/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.3/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.3/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.3/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.3/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.3/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.3/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.3/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.3/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.3/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.3/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.3/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.3/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.3/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.4/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.4/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.4/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.4/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.4/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.4/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.4/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.4/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.4/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.4/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.4/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.4/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.4/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.5/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.5/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.5/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.5/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.5/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.5/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.5/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.5/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.5/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.5/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.5/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.5/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.5/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.6/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.6/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.6/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.6/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.6/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.6/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.6/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.6/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.6/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.6/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.6/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.6/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.6/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.7/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.7/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.7/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.7/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.7/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.7/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.7/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.7/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.7/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.7/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.7/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.7/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.7/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.8/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.8/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.8/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.8/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.8/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.8/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.8/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.8/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.8/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.8/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.8/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.8/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.8/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml b/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml new file mode 100644 index 00000000..a97e2e9c --- /dev/null +++ b/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_empty.xml @@ -0,0 +1,27 @@ + + + + + + + + + 29 + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml b/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml new file mode 100644 index 00000000..bcebe6ca --- /dev/null +++ b/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-1.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + 0 + + + LOT-0000 + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + 2015-02-02+01:00 + 32014L0024 + can-standard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml b/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml new file mode 100644 index 00000000..15a2f692 --- /dev/null +++ b/mappings/package_can_v1.9/test_data/sdk_examples_can_invalid/INVALID_can_24_stage-2.xml @@ -0,0 +1,162 @@ + + + + + + + + + + RES-0001 + + + + 0 + + + + + + LOT-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.3 + eforms-sdk-1.3 + + + 2020-01-23+01:00 + 00:00:00+01:00 + 01 + 32014L0024 + can-standard + FRA + + + eu-ins-bod-ag + + + hc-am + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + + + + + + + + + + + + + + + + + + + 2000-01-01Z + + diff --git a/mappings/package_can_v1.9/transformation/mappings/Buyer.rml.ttl b/mappings/package_can_v1.9/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_can_v1.9/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_can_v1.9/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_can_v1.9/transformation/mappings/Lot.rml.ttl b/mappings/package_can_v1.9/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_can_v1.9/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_can_v1.9/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_can_v1.9/transformation/mappings/Tenderer-can.rml.ttl b/mappings/package_can_v1.9/transformation/mappings/Tenderer-can.rml.ttl index f31df59a..19873d32 100644 --- a/mappings/package_can_v1.9/transformation/mappings/Tenderer-can.rml.ttl +++ b/mappings/package_can_v1.9/transformation/mappings/Tenderer-can.rml.ttl @@ -153,6 +153,16 @@ tedm:MG-Organization-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_Organization_{cbc:ID}" ; rr:class org:Organization ] ; + rr:predicateObjectMap + [ + rdfs:label "OPT-211-Tenderer" ; + rdfs:comment "Tendering Party ID of MG-OrganisationGroup under ND-TenderingParty" ; + rr:predicate epo:hasAlias ; + rr:objectMap + [ + rml:reference "../cbc:Name" ; + ] ; + ] ; . tedm:MG-Organization-hasMember-OrganisationGroup-playedBy-Tenderer_ND-Tenderer a rr:TriplesMap ; diff --git a/mappings/package_cn_v1.10/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.10/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.10/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.10/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.10/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.10/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.10/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.10/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_cn_v1.3/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.3/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.3/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.3/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.3/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.3/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.3/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.3/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_cn_v1.4/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.4/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.4/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.4/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.4/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.4/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.4/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.4/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_cn_v1.5/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.5/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.5/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.5/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.5/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.5/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.5/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.5/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_cn_v1.6/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.6/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.6/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.6/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.6/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.6/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.6/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.6/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_cn_v1.7/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.7/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.7/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.7/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.7/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.7/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.7/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.7/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_cn_v1.8/output/op_test_cn_gh_issues/2024-OJS044-00129266/2024-OJS044-00129266.ttl b/mappings/package_cn_v1.8/output/op_test_cn_gh_issues/2024-OJS044-00129266/2024-OJS044-00129266.ttl index 3bb2d83a..1e4761fc 100644 --- a/mappings/package_cn_v1.8/output/op_test_cn_gh_issues/2024-OJS044-00129266/2024-OJS044-00129266.ttl +++ b/mappings/package_cn_v1.8/output/op_test_cn_gh_issues/2024-OJS044-00129266/2024-OJS044-00129266.ttl @@ -213,8 +213,8 @@ epd:id_95a505a4-924c-420b-958d-b628f7c4d50b_Procedure_MnX8qyREnFMNLeS5MJAX9K a e epo:hasProcedureType ; epo:hasProcurementScopeDividedIntoLot epd:id_95a505a4-924c-420b-958d-b628f7c4d50b_Lot_LOT-0001; epo:hasPurpose epd:id_95a505a4-924c-420b-958d-b628f7c4d50b_ProcedurePurpose_eySzap22e3jkZr3f7VXYNj; - dct:description """Mission de maîtrise d'oeuvre relative à la construction d'un ESAT, d'un service d'accueil de jour, d'un service d'accompagnement à la vie sociale et d'un immeuble de bureaux à vocation sociale à Aix Noulette. - + dct:description """Mission de maîtrise d'oeuvre relative à la construction d'un ESAT, d'un service d'accueil de jour, d'un service d'accompagnement à la vie sociale et d'un immeuble de bureaux à vocation sociale à Aix Noulette. + L'enveloppe financière affectée aux travaux est estimée à 15 500 000 euros H.T"""@fr; dct:title "Mission de maîtrise d'oeuvre relative à la construction d'un ESAT, service d'accueil de jour, service d'accompagnement à la vie sociale et d'un immeuble de bureaux à vocation sociale à Aix Noulette"@fr; adms:identifier epd:id_95a505a4-924c-420b-958d-b628f7c4d50b_ProcedureIdentifier_MnX8qyREnFMNLeS5MJAX9K . @@ -234,8 +234,8 @@ epd:id_95a505a4-924c-420b-958d-b628f7c4d50b_SelectionCriterion_F2EkrTHhwGTB3ZRA6 a epo:SelectionCriterion; epo:hasSelectionCriterionType ; epo:isUsedForCandidateRestriction true; - dct:description """Ce critère sera apprécié sur la base de la présentation de l'équipe dédiée : -- Cohérence de l'équipe proposée à l'objet du projet : qualifications et spécialisations mobilisées dans les domaines de compétences sollicités par l'acheteur. + dct:description """Ce critère sera apprécié sur la base de la présentation de l'équipe dédiée : +- Cohérence de l'équipe proposée à l'objet du projet : qualifications et spécialisations mobilisées dans les domaines de compétences sollicités par l'acheteur. - Adéquation des moyens humains - techniques et financiers du candidat à l'objet à l'importance du projet"""@fr; skos:prefLabel "Composition de l'équipe dédiée et compétences mobilisées"@fr . @@ -243,8 +243,8 @@ epd:id_95a505a4-924c-420b-958d-b628f7c4d50b_SelectionCriterion_QwLGZTLYe95szz5vd a epo:SelectionCriterion; epo:hasSelectionCriterionType ; epo:isUsedForCandidateRestriction true; - dct:description """Ce critère sera apprécié sur la base des références produites par le candidat : -- Cohérence des références présentées. + dct:description """Ce critère sera apprécié sur la base des références produites par le candidat : +- Cohérence des références présentées. - Qualité des réalisations présentées."""@fr; skos:prefLabel "Qualité des références présentées pour des opérations de nature et d'ampleur similaires"@fr . diff --git a/mappings/package_cn_v1.8/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.8/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.8/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.8/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.8/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.8/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.8/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.8/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ]; diff --git a/mappings/package_cn_v1.9/transformation/mappings/Buyer.rml.ttl b/mappings/package_cn_v1.9/transformation/mappings/Buyer.rml.ttl index a7d79ff4..42e62588 100644 --- a/mappings/package_cn_v1.9/transformation/mappings/Buyer.rml.ttl +++ b/mappings/package_cn_v1.9/transformation/mappings/Buyer.rml.ttl @@ -51,6 +51,10 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ; rr:objectMap [ rr:parentTriplesMap tedm:MG-Organization-playedBy-Buyer_ND-ServiceProvider ; + rr:joinCondition [ + rr:child "path(.)" ; + rr:parent "path(..)" ; + ] ; ] ; ] ; rr:predicateObjectMap diff --git a/mappings/package_cn_v1.9/transformation/mappings/Lot.rml.ttl b/mappings/package_cn_v1.9/transformation/mappings/Lot.rml.ttl index b45371ed..4d1d89b2 100644 --- a/mappings/package_cn_v1.9/transformation/mappings/Lot.rml.ttl +++ b/mappings/package_cn_v1.9/transformation/mappings/Lot.rml.ttl @@ -216,7 +216,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ; rr:parentTriplesMap tedm:MG-MultipleStageProcedureTerm-isSubjectToLotSpecificTerm-Lot_ND-LotTenderingProcess ; rr:joinCondition [ rr:child "path(.)"; - rr:parent "path(../../.)"; + rr:parent "path(..)"; ]; ] ; ];