Skip to content

Commit 93c776d

Browse files
schivmeisterschivmeister
committed
fix: remove all double-encoding
RML does URI-encoding already in rr:template, so there was never need for a `encode-for-uri()`.
1 parent 4915f25 commit 93c776d

50 files changed

Lines changed: 102 additions & 102 deletions

Some content is hidden

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

‎src/mappings-can/BudgetProvider-can.rml.ttl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tedm:MG-BudgetProvider_ND-FinancingParty a rr:TriplesMap ;
3535
rr:subjectMap
3636
[
3737
rdfs:label "ND-FinancingParty" ;
38-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/BudgetProvider/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
38+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/BudgetProvider/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
3939
rr:class epo:BudgetProvider
4040
] ;
4141
rr:predicateObjectMap
@@ -97,7 +97,7 @@ tedm:MG-BudgetProvider-seeAlso-LotAwardOutcome_ND-FinancingParty a rr:TriplesMap
9797
rr:subjectMap
9898
[
9999
rdfs:label "ND-FinancingParty" ;
100-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/BudgetProvider/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
100+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/BudgetProvider/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
101101
rr:class epo:BudgetProvider
102102
] ;
103103
.
@@ -113,7 +113,7 @@ tedm:MG-BudgetProvider-announcesRole-ResultNotice_ND-FinancingParty a rr:Triples
113113
rr:subjectMap
114114
[
115115
rdfs:label "ND-FinancingParty" ;
116-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/BudgetProvider/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
116+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/BudgetProvider/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
117117
rr:class epo:BudgetProvider
118118
] ;
119119
.

‎src/mappings-can/Business-can.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ tedm:MG-Identifier-identifier-Person_ND-UBO a rr:TriplesMap ;
113113
rr:subjectMap
114114
[
115115
rdfs:label "ND-UBO" ;
116-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Identifier/{encode-for-uri(cbc:ID)}" ;
116+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Identifier/{cbc:ID}" ;
117117
rr:class adms:Identifier
118118
] ;
119119
rr:predicateObjectMap

‎src/mappings-can/Contract-can.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ tedm:MG-Buyer-signedByBuyer-Contract_ND-ContractSignatory a rr:TriplesMap ;
372372
rr:subjectMap
373373
[
374374
rdfs:label "ND-ContractSignatory" ;
375-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Buyer/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
375+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Buyer/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
376376
rr:class epo:Buyer
377377
] ;
378378
rr:predicateObjectMap

‎src/mappings-can/LotGroup-can.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ tedm:MG-LotGroup-describesLotGroup-LotGroupAwardInformation_ND-NoticeResultGroup
7070
# rr:subjectMap
7171
# [
7272
# rdfs:label "ND-NoticeResultGroupFA";
73-
# rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/LotIdentifier/{encode-for-uri(efac:TenderLot/cbc:ID)}" ;
73+
# rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/LotIdentifier/{efac:TenderLot/cbc:ID}" ;
7474
# rr:class adms:Identifier
7575
# ] ;
7676
# rr:predicateObjectMap

‎src/mappings-can/PaymentExecutor-can.rml.ttl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ tedm:MG-PaymentExecutor-definesPaymentExecutor-ContractTerm-isSubjectToContractS
6565
rr:subjectMap
6666
[
6767
rdfs:label "ND-PayerParty" ;
68-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
68+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
6969
rr:class epo:PaymentExecutor
7070
] ;
7171
.
@@ -81,7 +81,7 @@ tedm:MG-PaymentExecutor_ND-PayerParty a rr:TriplesMap ;
8181
rr:subjectMap
8282
[
8383
rdfs:label "ND-PayerParty" ;
84-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
84+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
8585
rr:class epo:PaymentExecutor
8686
] ;
8787
rr:predicateObjectMap
@@ -143,7 +143,7 @@ tedm:MG-PaymentExecutor-seeAlso-LotAwardOutcome_ND-PayerParty a rr:TriplesMap ;
143143
rr:subjectMap
144144
[
145145
rdfs:label "ND-PayerParty" ;
146-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
146+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
147147
rr:class epo:PaymentExecutor
148148
] ;
149149
.
@@ -159,7 +159,7 @@ tedm:MG-PaymentExecutor-announcesRole-ResultNotice_ND-PayerParty a rr:TriplesMap
159159
rr:subjectMap
160160
[
161161
rdfs:label "ND-PayerParty" ;
162-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{encode-for-uri(concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName))}" ;
162+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/PaymentExecutor/{concat(cac:PartyIdentification/cbc:ID, cac:PartyIdentification/cbc:ID/@schemeName)}" ;
163163
rr:class epo:PaymentExecutor
164164
] ;
165165
.

‎src/mappings-can/Subcontractor-can.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ tedm:MG-Subcontractor-specifiesSubcontractors-Tender_ND-SubContractor a rr:Trip
3838
rr:subjectMap
3939
[
4040
rdfs:label "ND-TenderingParty";
41-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Subcontractor/{encode-for-uri(concat(cbc:ID, cbc:ID/@schemeName))}" ;
41+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Subcontractor/{concat(cbc:ID, cbc:ID/@schemeName)}" ;
4242
rr:class epo:Subcontractor
4343
] ;
4444
.
@@ -70,7 +70,7 @@ tedm:MG-Subcontractor_ND-SubContractor a rr:TriplesMap ;
7070
rr:subjectMap
7171
[
7272
rdfs:label "ND-SubContractor";
73-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Subcontractor/{encode-for-uri(concat(cbc:ID, cbc:ID/@schemeName))}" ;
73+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Subcontractor/{concat(cbc:ID, cbc:ID/@schemeName)}" ;
7474
rr:class epo:Subcontractor
7575
] ;
7676
rr:predicateObjectMap

‎src/mappings-can/root-can-modif.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ tedm:MG-Notice-refersToPrevious-ContractModificationNotice_ND-ContractModificati
129129
rr:subjectMap
130130
[
131131
rdfs:label "ND-ContractModification" ;
132-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{encode-for-uri(efbc:ChangedNoticeIdentifier)}" ;
132+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{efbc:ChangedNoticeIdentifier}" ;
133133
rr:class epo:Notice
134134
] ;
135135
rr:predicateObjectMap

‎src/mappings-can/root-can.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ tedm:MG-Subcontractor-announcesRole-ResultNotice_ND-SubContractor a rr:TriplesMa
511511
rr:subjectMap
512512
[
513513
rdfs:label "ND-SubContractor";
514-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Subcontractor/{encode-for-uri(concat(cbc:ID, cbc:ID/@schemeName))}" ;
514+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Subcontractor/{concat(cbc:ID, cbc:ID/@schemeName)}" ;
515515
rr:class epo:Subcontractor
516516
] ;
517517
.

‎src/mappings-pin/root-pin.rml.ttl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ tedm:MG-Notice-refersToPrevious-PlanningNotice_ND-PartPreviousPlanning a rr:Trip
261261
rr:subjectMap
262262
[
263263
rdfs:label "ND-PartPreviousPlanning" ;
264-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{encode-for-uri(cbc:ID)}" ;
264+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{cbc:ID}" ;
265265
rr:class epo:Notice
266266
] ;
267267
rr:predicateObjectMap
@@ -291,7 +291,7 @@ tedm:MG-PlanningNotice-refersToPrevious-PlanningNotice_ND-PartPreviousPlanning a
291291
rr:subjectMap
292292
[
293293
rdfs:label "ND-PartPreviousPlanning" ;
294-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{encode-for-uri(cbc:ID)}" ;
294+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{cbc:ID}" ;
295295
rr:class epo-not:PlanningNotice
296296
] ;
297297
rr:predicateObjectMap
@@ -357,7 +357,7 @@ tedm:MG-PlannedProcurementPart-announcesPlannedProcurementPart-PlanningNotice-re
357357
rr:subjectMap
358358
[
359359
rdfs:label "ND-PartPreviousPlanning" ;
360-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{encode-for-uri(cbc:ID)}/PlannedProcurementPart/{cbc:ReferencedDocumentInternalAddress}" ;
360+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Notice/{cbc:ID}/PlannedProcurementPart/{cbc:ReferencedDocumentInternalAddress}" ;
361361
rr:class epo:PlannedProcurementPart
362362
] ;
363363
rr:predicateObjectMap

‎src/mappings/Buyer.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tedm:MG-Buyer_ND-ContractingParty a rr:TriplesMap ;
3737
[
3838
rdfs:label "ND-ContractingParty" ;
3939
rdfs:comment "Primary type declaration for MG-Buyer under ND-ContractingParty" ;
40-
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Buyer/{encode-for-uri(concat(cac:Party/cac:PartyIdentification/cbc:ID, cac:Party/cac:PartyIdentification/cbc:ID/@schemeName))}" ;
40+
rr:template "http://data.europa.eu/a4g/resource/{/*/cbc:ID[@schemeName='notice-id']}-{/*/cbc:VersionID}/Buyer/{concat(cac:Party/cac:PartyIdentification/cbc:ID, cac:Party/cac:PartyIdentification/cbc:ID/@schemeName)}" ;
4141
rr:class epo:Buyer
4242
] ;
4343
# this is an example of an association to an independent resource (role to organization)

0 commit comments

Comments
 (0)