Skip to content

Commit 46ea38b

Browse files
schivmeisterschivmeister
authored
Merge pull request #107 from OP-TED/feature/old-and-new-fixes
Fixes for old and new mappings
2 parents 8ba01ae + 66ab970 commit 46ea38b

230 files changed

Lines changed: 3564 additions & 115965 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎mappings/package_can_v1.10/transformation/conceptual_mappings.xlsx‎

-150 Bytes
Binary file not shown.

‎mappings/package_can_v1.10/transformation/mappings/ChangeInformation.rml.ttl‎

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ tedm:MG-ChangeInformation_ND-ChangeReason a rr:TriplesMap ;
9090
rr:parent "path(.)";
9191
];
9292
] ;
93-
] ;
93+
] ;
9494
.
9595

9696
tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
@@ -105,7 +105,7 @@ tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
105105
rr:subjectMap
106106
[
107107
rdfs:label "ND-Change";
108-
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')}" ;
108+
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(if(exists(../efac:Change[2])) then path() else path(..)) || '?response_type=raw')}" ;
109109
rr:class epo:ChangeInformation
110110
] ;
111111
# rr:predicateObjectMap
@@ -153,7 +153,29 @@ tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
153153
rml:reference "efbc:ProcurementDocumentsChangeDate";
154154
rr:datatype xsd:date ;
155155
] ;
156-
]
156+
] ;
157+
rr:predicateObjectMap
158+
[
159+
rdfs:label "ND-Changes";
160+
rr:predicate epo:concernsNotice ;
161+
rr:objectMap
162+
[
163+
rr:parentTriplesMap tedm:MG-Notice_ND-Root ;
164+
] ;
165+
] ;
166+
rr:predicateObjectMap
167+
[
168+
rdfs:label "BT-758-notice";
169+
rr:predicate epo:refersToPreviousNotice ;
170+
rr:objectMap
171+
[
172+
rr:parentTriplesMap tedm:MG-Notice-refersToPreviousNotice-ChangeInformation_ND-Changes ;
173+
rr:joinCondition [
174+
rr:child "path(..)";
175+
rr:parent "path(.)";
176+
];
177+
] ;
178+
] ;
157179
.
158180

159181
tedm:MG-Identifier-identifier-Notice-refersToPreviousNotice-ChangeInformation_ND-Changes a rr:TriplesMap ;
@@ -179,7 +201,17 @@ tedm:MG-Identifier-identifier-Notice-refersToPreviousNotice-ChangeInformation_ND
179201
[
180202
rml:reference "efbc:ChangedNoticeIdentifier";
181203
] ;
182-
]
204+
] ;
205+
rr:predicateObjectMap
206+
[
207+
rdfs:label "BT-758-notice";
208+
rdfs:comment "Scheme of MG-Identifier under ND-Changes";
209+
rr:predicate epo:hasScheme ;
210+
rr:objectMap
211+
[
212+
rml:reference "efbc:ChangedNoticeIdentifier/cbc:ID/@schemeName";
213+
] ;
214+
] ;
183215
.
184216

185217
tedm:MG-Notice-concernsNotice-ChangeInformation_ND-Changes a rr:TriplesMap ;
@@ -241,7 +273,7 @@ tedm:MG-langString-hasChangeDescription-ChangeInformation_ND-Change a rr:Triples
241273
rr:subjectMap [
242274
rr:class epo-not:ChangeInformation ;
243275
rdfs:label "ND-Change" ;
244-
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')}" ;
276+
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(if(exists(../../efac:Change[2])) then path(..) else path(../..)) || '?response_type=raw')}" ;
245277
] ;
246278
rr:predicateObjectMap [
247279
rr:predicate epo-not:hasChangeDescription ;

‎mappings/package_can_v1.10/transformation/mappings/ChangeInformation_v1.7+.rml.ttl‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,32 @@
2424
@prefix idlab-fn: <http://example.com/idlab/function/> .
2525
@prefix tedm: <http://data.europa.eu/a4g/mapping/sf-rml/> .
2626

27-
tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
27+
tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
2828
rr:predicateObjectMap
2929
[
3030
rdfs:label "BT-13716-notice (object)";
3131
rr:predicate epo:relatesToEFormSectionIdentifier ;
3232
rr:objectMap
3333
[
34+
tedm:minSDKVersion "1.7" ;
35+
rr:parentTriplesMap tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedSection ;
36+
rr:joinCondition [
37+
rr:child "path(.)";
38+
rr:parent "path(..)";
39+
];
40+
] ;
41+
] ;
42+
.
43+
44+
tedm:MG-ChangeInformation_ND-ChangeReason a rr:TriplesMap ;
45+
rr:predicateObjectMap
46+
[
47+
rdfs:label "BT-13716-notice (object)";
48+
rr:predicate epo:relatesToEFormSectionIdentifier ;
49+
rr:objectMap
50+
[
51+
tedm:minSDKVersion "1.3" ;
52+
tedm:maxSDKVersion "1.6" ;
3453
rr:parentTriplesMap tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedSection ;
3554
rr:joinCondition [
3655
rr:child "path(.)";
@@ -49,7 +68,7 @@ tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedS
4968
];
5069
rr:subjectMap
5170
[
52-
rdfs:label "ND-Changes";
71+
rdfs:label "ND-ChangedSection";
5372
rml:reference "if (exists(efbc:ChangedSectionIdentifier)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(../../efbc:ChangedNoticeIdentifier, ' ', '-' ), '/' , '-') || '_ChangedSectionIdentifier_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
5473
rr:class adms:Identifier
5574
] ;

‎mappings/package_can_v1.10/transformation/mappings/Lot.rml.ttl‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ tedm:MG-Lot_ND-Lot a rr:TriplesMap ;
281281
rr:parentTriplesMap tedm:MG-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpening ;
282282
rr:joinCondition [
283283
rr:child "path(.)";
284-
rr:parent "path(../../.)";
284+
rr:parent "path(../..)";
285285
];
286286
] ;
287287
];
@@ -1819,8 +1819,8 @@ tedm:MG-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpening a rr:Triples
18191819
[
18201820
rr:parentTriplesMap tedm:MG-Address-definesOpeningPlace-OpeningTerm-isSubjectToLotSpecificTerm-Lot_ND-PublicOpeningPlace ;
18211821
rr:joinCondition[
1822-
rr:child "path(..)";
1823-
rr:parent "path(../..)"
1822+
rr:child "path()";
1823+
rr:parent "path(..)"
18241824
];
18251825
] ;
18261826
]
@@ -2070,13 +2070,17 @@ tedm:MG-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
20702070
rr:predicateObjectMap
20712071
[
20722072
rdfs:label "BT-5010-Lot";
2073-
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
2073+
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
20742074
rr:predicate adms:identifier ;
20752075
rr:objectMap
20762076
[
2077-
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding;
2077+
rr:parentTriplesMap tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding ;
2078+
rr:joinCondition [
2079+
rr:child "path()" ;
2080+
rr:parent "path()" ;
2081+
] ;
20782082
] ;
2079-
];
2083+
] ;
20802084
.
20812085

20822086
tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
@@ -2097,7 +2101,7 @@ tedm:MG-Identifier-identifier-Fund-isFundedBy-Lot_ND-Funding a rr:TriplesMap ;
20972101
[
20982102
tedm:minSDKVersion "1.9.1" ;
20992103
rdfs:label "BT-5010-Lot";
2100-
rdfs:comment "EUFundsFinancingIdentifier of MG-Identifierunder ND-Funding";
2104+
rdfs:comment "EU Funds Financing Identifier of MG-Identifierunder ND-Funding";
21012105
rr:predicate skos:notation ;
21022106
rr:objectMap
21032107
[

‎mappings/package_can_v1.10/transformation/mappings/LotGroupAwardInformation-can.rml.ttl‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,24 @@ tedm:MG-MonetaryValue-hasGroupFrameworkAgreementMaximumValue-LotGroupAwardInform
4949
rr:datatype xsd:decimal ;
5050
] ;
5151
] ;
52-
rr:predicateObjectMap
53-
[
54-
rr:predicate epo:hasCurrency ;
55-
rr:objectMap
56-
[
57-
rml:reference "cbc:EstimatedOverallContractAmount/@currencyID";
58-
] ;
59-
];
6052
rr:predicateObjectMap
6153
[
54+
rdfs:label "BT-156-NoticeResult";
55+
rdfs:comment "Currency of Group Framework Maximum Value of MG-MonetaryValue under ND-NoticeResultGroupFA";
6256
rr:predicate epo:hasCurrency ;
6357
rr:objectMap
6458
[
65-
rml:reference "efbc:GroupFrameworkMaximumValueAmount/@currencyID";
59+
rdfs:label "at-voc:currency" ;
60+
rr:parentTriplesMap tedm:currency ;
61+
rr:joinCondition [
62+
rr:child "efbc:GroupFrameworkMaximumValueAmount/@currencyID" ;
63+
rr:parent "code.value" ;
64+
] ;
6665
] ;
67-
]
66+
] ;
6867
.
6968

70-
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
69+
tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA a rr:TriplesMap ;
7170
rdfs:label "MG-LotGroupAwardInformation";
7271
rml:logicalSource
7372
[

‎mappings/package_can_v1.10/transformation/mappings/PaymentExecutor-can.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ tedm:MG-ContractTerm-isSubjectToContractSpecificTerm-Contract_ND-PayerParty a r
3636
[
3737
rdfs:label "ND-PayerParty" ;
3838
rdfs:comment "LotResultTechnicalIdentifier of MG-LotAwardOutcome under ND-LotResult" ;
39-
rr:template "http://data.europa.eu/a4g/resource/id_{replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-')}_ContractTerm_{unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw')}" ;
39+
rml:reference "if (exists(../../efac:SettledContract/cbc:ID)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ContractTerm_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
4040
rr:class epo:ContractTerm
4141
] ;
4242
rr:predicateObjectMap

‎mappings/package_can_v1.10/transformation/mappings/Tender-can.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ tedm:MG-MonetaryValue-hasFinancialOfferValue-Tender_ND-LotTender a rr:TriplesMa
251251
rr:subjectMap
252252
[
253253
rdfs:label "ND-LotTender" ;
254-
rml:reference "if (exists(cac:LegalMonetaryTotal/cbc:PayableAmount)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_MonetaryValue_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
254+
rml:reference "if (exists(cac:LegalMonetaryTotal/cbc:PayableAmount)) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_TenderMonetaryValue_' || unparsed-text('https://digest-api.ted-data.eu/api/v1/hashing/fn/uuid/' || encode-for-uri(path()) || '?response_type=raw') else null" ;
255255
rr:class epo:MonetaryValue
256256
] ;
257257
rr:predicateObjectMap

‎mappings/package_can_v1.10/transformation/mappings/root-can-modif.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ tedm:MG-Identifier-identifier-Notice-refersToPrevious-ContractModificationNotice
149149
] ;
150150
rr:predicateObjectMap
151151
[
152-
rdfs:label "BT-1501(n)-Contract" ;
152+
rdfs:label "BT-1501(n)-Contract-Scheme" ;
153153
rdfs:comment "Scheme of Modification Previous Notice Identifier of MG-Identifier under ND-ContractModification" ;
154154
rr:predicate epo:hasScheme ;
155155
rr:objectMap
156156
[
157-
rml:reference "efbc:ChangedNoticeIdentifier" ;
157+
rml:reference "efbc:ChangedNoticeIdentifier/@schemeName" ;
158158
] ;
159159
] ;
160160
.

‎mappings/package_can_v1.10/transformation/mappings/root-can.rml.ttl‎

Lines changed: 1 addition & 18 deletions
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-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
242+
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation_ND-NoticeResultGroupFA ;
243243
rr:joinCondition [
244244
rr:child "path(.)";
245245
rr:parent "path(..)";
@@ -432,23 +432,6 @@ tedm:MG-MonetaryValue-hasApproximateFrameworkAgreementValue-NoticeAwardInformati
432432
] ;
433433
.
434434

435-
436-
tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA a rr:TriplesMap ;
437-
rdfs:label "MG-LotGroupAwardInformation";
438-
rml:logicalSource
439-
[
440-
rml:source "data/source.xml" ;
441-
rml:iterator "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework" ;
442-
rml:referenceFormulation ql:XPath
443-
] ;
444-
rr:subjectMap
445-
[
446-
rdfs:label "ND-NoticeResult";
447-
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')}" ;
448-
rr:class epo:LotGroupAwardInformation
449-
] ;
450-
.
451-
452435
tedm:MG-ResultNotice_ND-LotResult a rr:TriplesMap ;
453436
rdfs:label "MG-ResultNotice" ;
454437
rml:logicalSource

‎mappings/package_can_v1.10/transformation/mappings/root-dap.ttl‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,6 @@ tedm:MG-DirectAwardPrenotificationNotice_ND-Root
6767
rr:parentTriplesMap tedm:MG-Lot_ND-Lot
6868
] ;
6969
] ;
70-
rr:predicateObjectMap
71-
[
72-
rdfs:label "MG-Lot-announcesLot-DirectAwardPrenotificationNotice";
73-
rdfs:comment "MG-Lot-announcesLot-DirectAwardPrenotificationNotice of MG-LotGroupAwardInformation under ND-NoticeResult";
74-
rr:predicate epo:announcesLotGroupAwardInformation ;
75-
rr:objectMap
76-
[
77-
rr:parentTriplesMap tedm:MG-LotGroupAwardInformation-announcesLotGroupAwardInformation-ResultNotice_ND-NoticeResultGroupFA ;
78-
rr:joinCondition [
79-
rr:child "path(.)";
80-
rr:parent "path(..)";
81-
];
82-
] ;
83-
] ;
8470
.
8571

8672
##--- Function Parameters ---

0 commit comments

Comments
 (0)