Skip to content

Commit 340e93c

Browse files
schivmeisterschivmeister
committed
Revert "Fix isProcurementDocumentChanged values, refactor ChangeInformation"
This reverts commit 8f4480e.
1 parent 5b49af2 commit 340e93c

23 files changed

Lines changed: 92 additions & 566 deletions

File tree

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

Lines changed: 4 additions & 26 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(if(exists(../efac:Change[2])) then path() else 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(path(..)) || '?response_type=raw')}" ;
109109
rr:class epo:ChangeInformation
110110
] ;
111111
# rr:predicateObjectMap
@@ -153,29 +153,7 @@ tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
153153
rml:reference "efbc:ProcurementDocumentsChangeDate";
154154
rr:datatype xsd:date ;
155155
] ;
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-
] ;
156+
]
179157
.
180158

181159
tedm:MG-Identifier-identifier-Notice-refersToPreviousNotice-ChangeInformation_ND-Changes a rr:TriplesMap ;
@@ -273,7 +251,7 @@ tedm:MG-langString-hasChangeDescription-ChangeInformation_ND-Change a rr:Triples
273251
rr:subjectMap [
274252
rr:class epo-not:ChangeInformation ;
275253
rdfs:label "ND-Change" ;
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')}" ;
254+
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')}" ;
277255
] ;
278256
rr:predicateObjectMap [
279257
rr:predicate epo-not:hasChangeDescription ;

‎mappings/package_eforms_sdk1.10_epo4.0/transformation/mappings/ChangeInformation_v1.7+.rml.ttl‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,13 @@
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" ;
5334
rr:parentTriplesMap tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedSection ;
5435
rr:joinCondition [
5536
rr:child "path(.)";
@@ -68,7 +49,7 @@ tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedS
6849
];
6950
rr:subjectMap
7051
[
71-
rdfs:label "ND-ChangedSection";
52+
rdfs:label "ND-Changes";
7253
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" ;
7354
rr:class adms:Identifier
7455
] ;

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

Lines changed: 4 additions & 26 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(if(exists(../efac:Change[2])) then path() else 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(path(..)) || '?response_type=raw')}" ;
109109
rr:class epo:ChangeInformation
110110
] ;
111111
# rr:predicateObjectMap
@@ -153,29 +153,7 @@ tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
153153
rml:reference "efbc:ProcurementDocumentsChangeDate";
154154
rr:datatype xsd:date ;
155155
] ;
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-
] ;
156+
]
179157
.
180158

181159
tedm:MG-Identifier-identifier-Notice-refersToPreviousNotice-ChangeInformation_ND-Changes a rr:TriplesMap ;
@@ -273,7 +251,7 @@ tedm:MG-langString-hasChangeDescription-ChangeInformation_ND-Change a rr:Triples
273251
rr:subjectMap [
274252
rr:class epo-not:ChangeInformation ;
275253
rdfs:label "ND-Change" ;
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')}" ;
254+
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')}" ;
277255
] ;
278256
rr:predicateObjectMap [
279257
rr:predicate epo-not:hasChangeDescription ;

‎mappings/package_eforms_sdk1.11_epo4.0/transformation/mappings/ChangeInformation_v1.7+.rml.ttl‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,13 @@
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" ;
5334
rr:parentTriplesMap tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedSection ;
5435
rr:joinCondition [
5536
rr:child "path(.)";
@@ -68,7 +49,7 @@ tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedS
6849
];
6950
rr:subjectMap
7051
[
71-
rdfs:label "ND-ChangedSection";
52+
rdfs:label "ND-Changes";
7253
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" ;
7354
rr:class adms:Identifier
7455
] ;

‎mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/ChangeInformation.rml.ttl‎

Lines changed: 4 additions & 26 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(if(exists(../efac:Change[2])) then path() else 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(path(..)) || '?response_type=raw')}" ;
109109
rr:class epo:ChangeInformation
110110
] ;
111111
# rr:predicateObjectMap
@@ -153,29 +153,7 @@ tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
153153
rml:reference "efbc:ProcurementDocumentsChangeDate";
154154
rr:datatype xsd:date ;
155155
] ;
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-
] ;
156+
]
179157
.
180158

181159
tedm:MG-Identifier-identifier-Notice-refersToPreviousNotice-ChangeInformation_ND-Changes a rr:TriplesMap ;
@@ -273,7 +251,7 @@ tedm:MG-langString-hasChangeDescription-ChangeInformation_ND-Change a rr:Triples
273251
rr:subjectMap [
274252
rr:class epo-not:ChangeInformation ;
275253
rdfs:label "ND-Change" ;
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')}" ;
254+
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')}" ;
277255
] ;
278256
rr:predicateObjectMap [
279257
rr:predicate epo-not:hasChangeDescription ;

‎mappings/package_eforms_sdk1.12_epo4.0/transformation/mappings/ChangeInformation_v1.7+.rml.ttl‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,13 @@
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" ;
5334
rr:parentTriplesMap tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedSection ;
5435
rr:joinCondition [
5536
rr:child "path(.)";
@@ -68,7 +49,7 @@ tedm:MG-Identifier-relatesToEFormSectionIdentifier-ChangeInformation_ND-ChangedS
6849
];
6950
rr:subjectMap
7051
[
71-
rdfs:label "ND-ChangedSection";
52+
rdfs:label "ND-Changes";
7253
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" ;
7354
rr:class adms:Identifier
7455
] ;

‎mappings/package_eforms_sdk1.13_epo4.0/transformation/mappings/ChangeInformation.rml.ttl‎

Lines changed: 4 additions & 26 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(if(exists(../efac:Change[2])) then path() else 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(path(..)) || '?response_type=raw')}" ;
109109
rr:class epo:ChangeInformation
110110
] ;
111111
# rr:predicateObjectMap
@@ -153,29 +153,7 @@ tedm:MG-ChangeInformation_ND-Change a rr:TriplesMap ;
153153
rml:reference "efbc:ProcurementDocumentsChangeDate";
154154
rr:datatype xsd:date ;
155155
] ;
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-
] ;
156+
]
179157
.
180158

181159
tedm:MG-Identifier-identifier-Notice-refersToPreviousNotice-ChangeInformation_ND-Changes a rr:TriplesMap ;
@@ -273,7 +251,7 @@ tedm:MG-langString-hasChangeDescription-ChangeInformation_ND-Change a rr:Triples
273251
rr:subjectMap [
274252
rr:class epo-not:ChangeInformation ;
275253
rdfs:label "ND-Change" ;
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')}" ;
254+
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')}" ;
277255
] ;
278256
rr:predicateObjectMap [
279257
rr:predicate epo-not:hasChangeDescription ;

0 commit comments

Comments
 (0)