Skip to content

Commit 8ad2703

Browse files
committed
Revert "Guard against empty LotGroupAwardInformation, optimize TMap linkage"
This reverts commit 130af19.
1 parent ce04871 commit 8ad2703

22 files changed

Lines changed: 198 additions & 22 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ tedm:MG-MonetaryValue-hasGroupFrameworkAgreementMaximumValue-LotGroupAwardInform
6666
] ;
6767
.
6868

69-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
69+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7070
rdfs:label "MG-LotGroupAwardInformation";
7171
rml:logicalSource
7272
[

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ tedm:MG-ResultNotice_ND-NoticeResult a rr:TriplesMap ;
239239
rr:predicate epo:announcesLotGroupAwardInformation ;
240240
rr:objectMap
241241
[
242-
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA ;
242+
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
243243
rr:joinCondition [
244244
rr:child "path(.)";
245245
rr:parent "path(..)";
@@ -432,6 +432,22 @@ tedm:MG-MonetaryValue-hasApproximateFrameworkAgreementValue-NoticeAwardInformati
432432
] ;
433433
.
434434

435+
tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA a rr:TriplesMap ;
436+
rdfs:label "MG-LotGroupAwardInformation";
437+
rml:logicalSource
438+
[
439+
rml:source "data/source.xml" ;
440+
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework" ;
441+
rml:referenceFormulation ql:XPath
442+
] ;
443+
rr:subjectMap
444+
[
445+
rdfs:label "ND-NoticeResult";
446+
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')}" ;
447+
rr:class epo:LotGroupAwardInformation
448+
] ;
449+
.
450+
435451
# these properties are shared among other CAN types such as DAP and cont-modif based on certain conditions
436452
tedm:MG-Notice_ND-LotResult a rr:TriplesMap ;
437453
rdfs:label "MG-Notice" ;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ tedm:MG-MonetaryValue-hasGroupFrameworkAgreementMaximumValue-LotGroupAwardInform
6666
] ;
6767
.
6868

69-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
69+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7070
rdfs:label "MG-LotGroupAwardInformation";
7171
rml:logicalSource
7272
[

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ tedm:MG-ResultNotice_ND-NoticeResult a rr:TriplesMap ;
239239
rr:predicate epo:announcesLotGroupAwardInformation ;
240240
rr:objectMap
241241
[
242-
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA ;
242+
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
243243
rr:joinCondition [
244244
rr:child "path(.)";
245245
rr:parent "path(..)";
@@ -432,6 +432,22 @@ tedm:MG-MonetaryValue-hasApproximateFrameworkAgreementValue-NoticeAwardInformati
432432
] ;
433433
.
434434

435+
tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA a rr:TriplesMap ;
436+
rdfs:label "MG-LotGroupAwardInformation";
437+
rml:logicalSource
438+
[
439+
rml:source "data/source.xml" ;
440+
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework" ;
441+
rml:referenceFormulation ql:XPath
442+
] ;
443+
rr:subjectMap
444+
[
445+
rdfs:label "ND-NoticeResult";
446+
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')}" ;
447+
rr:class epo:LotGroupAwardInformation
448+
] ;
449+
.
450+
435451
# these properties are shared among other CAN types such as DAP and cont-modif based on certain conditions
436452
tedm:MG-Notice_ND-LotResult a rr:TriplesMap ;
437453
rdfs:label "MG-Notice" ;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ tedm:MG-MonetaryValue-hasGroupFrameworkAgreementMaximumValue-LotGroupAwardInform
6666
] ;
6767
.
6868

69-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
69+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7070
rdfs:label "MG-LotGroupAwardInformation";
7171
rml:logicalSource
7272
[

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ tedm:MG-ResultNotice_ND-NoticeResult a rr:TriplesMap ;
239239
rr:predicate epo:announcesLotGroupAwardInformation ;
240240
rr:objectMap
241241
[
242-
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA ;
242+
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
243243
rr:joinCondition [
244244
rr:child "path(.)";
245245
rr:parent "path(..)";
@@ -432,6 +432,22 @@ tedm:MG-MonetaryValue-hasApproximateFrameworkAgreementValue-NoticeAwardInformati
432432
] ;
433433
.
434434

435+
tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA a rr:TriplesMap ;
436+
rdfs:label "MG-LotGroupAwardInformation";
437+
rml:logicalSource
438+
[
439+
rml:source "data/source.xml" ;
440+
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework" ;
441+
rml:referenceFormulation ql:XPath
442+
] ;
443+
rr:subjectMap
444+
[
445+
rdfs:label "ND-NoticeResult";
446+
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')}" ;
447+
rr:class epo:LotGroupAwardInformation
448+
] ;
449+
.
450+
435451
# these properties are shared among other CAN types such as DAP and cont-modif based on certain conditions
436452
tedm:MG-Notice_ND-LotResult a rr:TriplesMap ;
437453
rdfs:label "MG-Notice" ;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ tedm:MG-MonetaryValue-hasGroupFrameworkAgreementMaximumValue-LotGroupAwardInform
6666
] ;
6767
.
6868

69-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
69+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7070
rdfs:label "MG-LotGroupAwardInformation";
7171
rml:logicalSource
7272
[

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ tedm:MG-ResultNotice_ND-NoticeResult a rr:TriplesMap ;
239239
rr:predicate epo:announcesLotGroupAwardInformation ;
240240
rr:objectMap
241241
[
242-
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA ;
242+
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
243243
rr:joinCondition [
244244
rr:child "path(.)";
245245
rr:parent "path(..)";
@@ -432,6 +432,22 @@ tedm:MG-MonetaryValue-hasApproximateFrameworkAgreementValue-NoticeAwardInformati
432432
] ;
433433
.
434434

435+
tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA a rr:TriplesMap ;
436+
rdfs:label "MG-LotGroupAwardInformation";
437+
rml:logicalSource
438+
[
439+
rml:source "data/source.xml" ;
440+
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework" ;
441+
rml:referenceFormulation ql:XPath
442+
] ;
443+
rr:subjectMap
444+
[
445+
rdfs:label "ND-NoticeResult";
446+
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')}" ;
447+
rr:class epo:LotGroupAwardInformation
448+
] ;
449+
.
450+
435451
# these properties are shared among other CAN types such as DAP and cont-modif based on certain conditions
436452
tedm:MG-Notice_ND-LotResult a rr:TriplesMap ;
437453
rdfs:label "MG-Notice" ;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ tedm:MG-MonetaryValue-hasGroupFrameworkAgreementMaximumValue-LotGroupAwardInform
6666
] ;
6767
.
6868

69-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
69+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7070
rdfs:label "MG-LotGroupAwardInformation";
7171
rml:logicalSource
7272
[

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ tedm:MG-ResultNotice_ND-NoticeResult a rr:TriplesMap ;
239239
rr:predicate epo:announcesLotGroupAwardInformation ;
240240
rr:objectMap
241241
[
242-
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA ;
242+
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
243243
rr:joinCondition [
244244
rr:child "path(.)";
245245
rr:parent "path(..)";
@@ -432,6 +432,22 @@ tedm:MG-MonetaryValue-hasApproximateFrameworkAgreementValue-NoticeAwardInformati
432432
] ;
433433
.
434434

435+
tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA a rr:TriplesMap ;
436+
rdfs:label "MG-LotGroupAwardInformation";
437+
rml:logicalSource
438+
[
439+
rml:source "data/source.xml" ;
440+
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework" ;
441+
rml:referenceFormulation ql:XPath
442+
] ;
443+
rr:subjectMap
444+
[
445+
rdfs:label "ND-NoticeResult";
446+
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')}" ;
447+
rr:class epo:LotGroupAwardInformation
448+
] ;
449+
.
450+
435451
# these properties are shared among other CAN types such as DAP and cont-modif based on certain conditions
436452
tedm:MG-Notice_ND-LotResult a rr:TriplesMap ;
437453
rdfs:label "MG-Notice" ;

0 commit comments

Comments
 (0)