Skip to content

Commit

Permalink
Merge pull request #70 from OP-TED/feature/d4.1-fixes
Browse files Browse the repository at this point in the history 
All fixes and improvements, including language maps
  • Loading branch information
@csnyulas
csnyulas authored Oct 11, 2024
2 parents acd5eb0 + db92b1d commit f7df13e
Show file tree
Hide file tree
Showing 221 changed files with 62,728 additions and 22,372 deletions.
1,830 changes: 1,830 additions & 0 deletions ..._can_v1.10/output/sampling_multilingual_can/2024-OJS170-00525037/2024-OJS170-00525037.ttl
View file

Large diffs are not rendered by default.

1,141 changes: 1,141 additions & 0 deletions ...ngs/package_can_v1.10/test_data/sampling_manual_CAN_202404/2024-OJS072-00215550-modif.xml
View file

Large diffs are not rendered by default.

1,900 changes: 1,900 additions & 0 deletions mappings/package_can_v1.10/test_data/sampling_multilingual_can/2024-OJS170-00525037.xml
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion mappings/package_can_v1.10/transformation/mappings/AwardingCentralPurchasingBody.rml.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ tedm:MG-AwardingCentralPurchasingBody_ND-Organization a rr:TriplesMap ;
rr:predicate epo:playedBy ;
rr:objectMap
[
rdfs:label "Awarding CPB Buyer Indicator" ;
rdfs:label "OPP-051-Organization";
rdfs:comment "Awarding CPB Buyer Indicator of MG-AwardingCentralPurchasingBody under ND-Organization " ;
rr:parentTriplesMap tedm:MG-Organization-playedBy-AwardingCentralPurchasingBody_ND-Organization ;
rr:joinCondition [
rr:child "path(.)" ;
Expand Down
2 changes: 1 addition & 1 deletion mappings/package_can_v1.10/transformation/mappings/Business-can.rml.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ tedm:MG-Address-registeredAddress-Person_ND-UBOAddress a rr:TriplesMap ;
rr:predicate locn:fullAddress ;
rr:objectMap
[
rml:reference "if (exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line)) then replace(replace(cbc:Department || ', ' || cbc:StreetName || ', ' || cbc:AdditionalStreetName || ', ' || cac:AddressLine/cbc:Line || ', ' || cbc:CityName || ', ' || cbc:PostalZone || ', ' || cac:Country/cbc:IdentificationCode, '(, )+', ', '), '^, |, $', '') else null" ;
rml:reference "if (exists(cbc:StreetName) or exists(cbc:AdditionalStreetName) or exists(cac:AddressLine/cbc:Line)) then replace(replace(cbc:StreetName || ', ' || cbc:AdditionalStreetName || ', ' || cac:AddressLine/cbc:Line || ', ' || cbc:CityName || ', ' || cbc:PostalZone || ', ' || cac:Country/cbc:IdentificationCode, '(, )+', ', '), '^, |, $', '') else null" ;
] ;
] ;
rr:predicateObjectMap
Expand Down
173 changes: 124 additions & 49 deletions mappings/package_can_v1.10/transformation/mappings/ChangeInformation.rml.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,31 @@ tedm:MG-ChangeInformation_ND-ChangeReason a rr:TriplesMap ;
] ;
] ;
] ;
rr:predicateObjectMap
[
rdfs:label "BT-762-notice";
rdfs:comment "Change Reason Description of MG-ChangeInformation under ND-ChangeReason";
rr:predicate epo:hasChangeReasonDescription ;
rr:objectMap
[
tedm:minSDKVersion "1.4" ;
rdfs:label "BT-762-notice-Language";
rdfs:comment "Language of Change Reason Description of MG-ChangeInformation under ND-ChangeReason";
rml:reference "efbc:ReasonDescription";
rml:languageMap [
fnml:functionValue [
rr:predicateObjectMap [
rr:predicate idlab-fn:str ;
rr:objectMap [ rml:reference "efbc:ReasonDescription/@languageID" ]
] ,
tedm:idlab-fn_executes_lookup ,
tedm:idlab-fn_inputFile_language ,
tedm:idlab-fn_fromColumn_code ,
tedm:idlab-fn_toColumn_code
]
] ;
] ;
] ;
# rr:predicateObjectMap
# [
# rdfs:label "BT-762-notice";
# rdfs:comment "Change Reason Description of MG-ChangeInformation under ND-ChangeReason";
# rr:predicate epo:hasChangeReasonDescription ;
# rr:objectMap
# [
# tedm:minSDKVersion "1.4" ;
# rdfs:label "BT-762-notice-Language";
# rdfs:comment "Language of Change Reason Description of MG-ChangeInformation under ND-ChangeReason";
# rml:reference "efbc:ReasonDescription";
# rml:languageMap [
# fnml:functionValue [
# rr:predicateObjectMap [
# rr:predicate idlab-fn:str ;
# rr:objectMap [ rml:reference "efbc:ReasonDescription/@languageID" ]
# ] ,
# tedm:idlab-fn_executes_lookup ,
# tedm:idlab-fn_inputFile_language ,
# tedm:idlab-fn_fromColumn_code ,
# tedm:idlab-fn_toColumn_code
# ]
# ] ;
# ] ;
# ] ;
rr:predicateObjectMap
[
rdfs:label "BT-758-notice";
Expand Down Expand Up @@ -108,30 +108,30 @@ tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_ChangeInformation_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(..)) || '?response_type=raw')}" ;
rr:class epo:ChangeInformation
] ;
rr:predicateObjectMap
[
rdfs:label "BT-141(a)-notice";
rdfs:comment "Change Description of MG-ChangeInformation under ND-Change";
rr:predicate epo:hasChangeDescription ;
rr:objectMap
[
rdfs:label "BT-141(a)-notice-Language";
rdfs:comment "Language of Change Description of MG-ChangeInformation under ND-Change";
rml:reference "efbc:ChangeDescription";
rml:languageMap [
fnml:functionValue [
rr:predicateObjectMap [
rr:predicate idlab-fn:str ;
rr:objectMap [ rml:reference "efbc:ChangeDescription/@languageID" ]
] ,
tedm:idlab-fn_executes_lookup ,
tedm:idlab-fn_inputFile_language ,
tedm:idlab-fn_fromColumn_code ,
tedm:idlab-fn_toColumn_code
]
] ;
] ;
] ;
# rr:predicateObjectMap
# [
# rdfs:label "BT-141(a)-notice";
# rdfs:comment "Change Description of MG-ChangeInformation under ND-Change";
# rr:predicate epo:hasChangeDescription ;
# rr:objectMap
# [
# rdfs:label "BT-141(a)-notice-Language";
# rdfs:comment "Language of Change Description of MG-ChangeInformation under ND-Change";
# rml:reference "efbc:ChangeDescription";
# rml:languageMap [
# fnml:functionValue [
# rr:predicateObjectMap [
# rr:predicate idlab-fn:str ;
# rr:objectMap [ rml:reference "efbc:ChangeDescription/@languageID" ]
# ] ,
# tedm:idlab-fn_executes_lookup ,
# tedm:idlab-fn_inputFile_language ,
# tedm:idlab-fn_fromColumn_code ,
# tedm:idlab-fn_toColumn_code
# ]
# ] ;
# ] ;
# ] ;
rr:predicateObjectMap
[
rdfs:label "BT-718-notice";
Expand Down Expand Up @@ -236,3 +236,78 @@ tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedS
# subject template and predicate mappings are in versioned files (ChangeInformation_v1.3-16|v1.7+)
rdfs:label "MG-Identifier";
.

tedm:MG-langString-hasChangeDescription-ChangeInformation_ND-Change a rr:TriplesMap ;
rr:subjectMap [
rr:class epo-not:ChangeInformation ;
rdfs:label "ND-Change" ;
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_ChangeInformation_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(../..)) || '?response_type=raw')}" ;
] ;
rr:predicateObjectMap [
rr:predicate epo-not:hasChangeDescription ;
rr:objectMap [
rml:reference "." ;
rml:languageMap [
fnml:functionValue [
rr:predicateObjectMap [
rr:predicate idlab-fn:str ;
rr:objectMap [
rml:reference "@languageID" ;
] ;
] ;
rr:predicateObjectMap tedm:idlab-fn_executes_lookup ;
rr:predicateObjectMap tedm:idlab-fn_fromColumn_code ;
rr:predicateObjectMap tedm:idlab-fn_inputFile_language ;
rr:predicateObjectMap tedm:idlab-fn_toColumn_code ;
] ;
] ;
rdfs:comment "Language of Change Description of MG-ChangeInformation under ND-Change" ;
rdfs:label "BT-141(a)-notice-Language" ;
] ;
rdfs:comment "Change Description of MG-ChangeInformation under ND-Change" ;
rdfs:label "BT-141(a)-notice" ;
] ;
rdfs:label "MG-ChangeInformation" ;
rml:logicalSource [
rml:source "data/source.xml" ;
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:Change/efbc:ChangeDescription" ;
rml:referenceFormulation ql:XPath ;
] .

tedm:MG-langString-hasChangeReasonDescription-ChangeInformation_ND-ChangeReason a rr:TriplesMap ;
rr:subjectMap [
rr:class epo-not:ChangeInformation ;
rdfs:label "ND-ChangeReason" ;
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_ChangeInformation_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path(../..)) || '?response_type=raw')}" ;
] ;
rr:predicateObjectMap [
rr:predicate epo-not:hasChangeReasonDescription ;
rr:objectMap [
tedm:minSDKVersion "1.4" ;
rml:reference "." ;
rml:languageMap [
fnml:functionValue [
rr:predicateObjectMap [
rr:predicate idlab-fn:str ;
rr:objectMap [
rml:reference "@languageID" ;
] ;
] ;
rr:predicateObjectMap tedm:idlab-fn_executes_lookup ;
rr:predicateObjectMap tedm:idlab-fn_fromColumn_code ;
rr:predicateObjectMap tedm:idlab-fn_inputFile_language ;
rr:predicateObjectMap tedm:idlab-fn_toColumn_code ;
] ;
] ;
rdfs:comment "Language of Change Reason Description of MG-ChangeInformation under ND-ChangeReason" ;
rdfs:label "BT-762-notice-Language" ;
] ;
rdfs:comment "Change Reason Description of MG-ChangeInformation under ND-ChangeReason" ;
rdfs:label "BT-762-notice" ;
] ;
rdfs:label "MG-ChangeInformation" ;
rml:logicalSource [
rml:source "data/source.xml" ;
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:ChangeReason/efbc:ReasonDescription" ;
rml:referenceFormulation ql:XPath ;
] .
86 changes: 62 additions & 24 deletions mappings/package_can_v1.10/transformation/mappings/ContactPoint.rml.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,30 @@ tedm:MG-ContactPoint_ND-Touchpoint a rr:TriplesMap ;
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_TouchPoint_{cac:PartyIdentification/cbc:ID}" ;
rr:class cpov:ContactPoint
] ;
rr:predicateObjectMap
[
rdfs:label "BT-500-Organization-TouchPoint" ;
rdfs:comment "Name of MG-ContactPoint of under ND-Touchpoint" ;
rr:predicate dct:description ;
rr:objectMap
[
rdfs:label "BT-500-Organization-TouchPoint-Language" ;
rdfs:comment "Language of Name of MG-ContactPoint of under ND-Touchpoint" ;
rml:reference "cac:PartyName/cbc:Name" ;
rml:languageMap [
fnml:functionValue [
rr:predicateObjectMap [
rr:predicate idlab-fn:str ;
rr:objectMap [ rml:reference "cac:PartyName/cbc:Name/@languageID" ]
] ,
tedm:idlab-fn_executes_lookup ,
tedm:idlab-fn_inputFile_language ,
tedm:idlab-fn_fromColumn_code ,
tedm:idlab-fn_toColumn_code
]
] ;
] ;
] ;
# rr:predicateObjectMap
# [
# rdfs:label "BT-500-Organization-TouchPoint" ;
# rdfs:comment "Name of MG-ContactPoint of under ND-Touchpoint" ;
# rr:predicate dct:description ;
# rr:objectMap
# [
# rdfs:label "BT-500-Organization-TouchPoint-Language" ;
# rdfs:comment "Language of Name of MG-ContactPoint of under ND-Touchpoint" ;
# rml:reference "cac:PartyName/cbc:Name" ;
# rml:languageMap [
# fnml:functionValue [
# rr:predicateObjectMap [
# rr:predicate idlab-fn:str ;
# rr:objectMap [ rml:reference "cac:PartyName/cbc:Name/@languageID" ]
# ] ,
# tedm:idlab-fn_executes_lookup ,
# tedm:idlab-fn_inputFile_language ,
# tedm:idlab-fn_fromColumn_code ,
# tedm:idlab-fn_toColumn_code
# ]
# ] ;
# ] ;
# ] ;
rr:predicateObjectMap
[
rr:predicate locn:address ;
Expand Down Expand Up @@ -248,3 +248,41 @@ tedm:MG-ContactPoint_ND-TouchpointContact a rr:TriplesMap ;
] ;
] ;
.

tedm:MG-langString-description-ContactPoint_ND-Touchpoint a rr:TriplesMap ;
rml:logicalSource [
rml:source "data/source.xml" ;
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PartyName/cbc:Name" ;
rml:referenceFormulation ql:XPath ;
] ;
rr:subjectMap [
rr:class cccev:ContactPoint ;
rdfs:comment "Primary type declaration for MG-ContactPoint under ND-Touchpoint" ;
rdfs:label "ND-Touchpoint" ;
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_TouchPoint_{../../cac:PartyIdentification/cbc:ID}" ;
] ;
rr:predicateObjectMap [
rr:predicate dct:description ;
rr:objectMap [
rml:reference "." ;
rml:languageMap [
fnml:functionValue [
rr:predicateObjectMap [
rr:predicate idlab-fn:str ;
rr:objectMap [
rml:reference "@languageID" ;
] ;
] ;
rr:predicateObjectMap tedm:idlab-fn_executes_lookup ;
rr:predicateObjectMap tedm:idlab-fn_fromColumn_code ;
rr:predicateObjectMap tedm:idlab-fn_inputFile_language ;
rr:predicateObjectMap tedm:idlab-fn_toColumn_code ;
] ;
] ;
rdfs:comment "Language of Name of MG-ContactPoint of under ND-Touchpoint" ;
rdfs:label "BT-500-Organization-TouchPoint-Language" ;
] ;
rdfs:comment "Name of MG-ContactPoint of under ND-Touchpoint" ;
rdfs:label "BT-500-Organization-TouchPoint" ;
] ;
rdfs:label "MG-ContactPoint" .
Loading

0 comments on commit f7df13e

Please # to comment.