Skip to content

Commit fc4998c

Browse files
schivmeisterschivmeister
committed
Fix some missed hash removals and mistaken regex code
1 parent d889851 commit fc4998c

27 files changed

Lines changed: 497 additions & 420 deletions

‎src/mappings-versioned/Lot_v1.3-1.7.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ tedm:MG-ProcurementDocument-involvesProcurementDocument-AccessTerm-isSubjectToLo
7979
rr:subjectMap
8080
[
8181
rdfs:label "ND-LotDocOfficialLanguage";
82-
rml:reference "if (exists(cbc:LanguageID[not(../cbc:DocumentStatusCode/text()='non-official')])) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementDocument_' || replace(replace(replace(concat(path(..), cbc:ID/text()), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '_$1'), '/', '_') else null" ;
82+
rml:reference "if (exists(cbc:LanguageID[not(../cbc:DocumentStatusCode/text()='non-official')])) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementDocument_' || replace(replace(replace(concat(path(..), cbc:ID/text()), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_') else null" ;
8383
rr:class epo:ProcurementDocument
8484
] ;
8585
rml:logicalSource

‎src/mappings-versioned/Lot_v1.3-1.8.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ tedm:MG-ProcurementDocument-involvesProcurementDocument-AccessTerm-isSubjectToLo
237237
rr:subjectMap
238238
[
239239
rdfs:label "ND-LotDocAllNonOfficialLanguages";
240-
rml:reference "if (exists(cbc:LanguageID[../cbc:DocumentStatusCode/text()='non-official'])) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementDocument_' || replace(replace(replace(concat(path(..), cbc:ID/text()), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '_$1'), '/', '_') else null" ;
240+
rml:reference "if (exists(cbc:LanguageID[../cbc:DocumentStatusCode/text()='non-official'])) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementDocument_' || replace(replace(replace(concat(path(..), cbc:ID/text()), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_') else null" ;
241241
rr:class epo:ProcurementDocument
242242
] ;
243243
rr:predicateObjectMap

‎src/mappings-versioned/Lot_v1.8-1.8.rml.ttl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tedm:MG-ProcurementDocument-involvesProcurementDocument-AccessTerm-isSubjectToLo
2828
rr:subjectMap
2929
[
3030
rdfs:label "ND-LotDocOfficialLanguage";
31-
rml:reference "if (exists(cbc:LanguageID[../cbc:DocumentStatusCode/text()='official'])) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementDocument_' || replace(replace(replace(concat(path(..), cbc:ID/text()), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '_$1'), '/', '_') else null" ;
31+
rml:reference "if (exists(cbc:LanguageID[../cbc:DocumentStatusCode/text()='official'])) then 'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_ProcurementDocument_' || replace(replace(replace(concat(path(..), cbc:ID/text()), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_') else null" ;
3232
rr:class epo:ProcurementDocument
3333
] ;
3434
rml:logicalSource

‎src/mappings-versioned/VehicleInformation-can_v1.13+.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tedm:MG-VehicleInformation_ND-ProcurementDetailsLotResult a rr:TriplesMap ;
3535
rr:subjectMap
3636
[
3737
rdfs:label "ND-ProcurementDetailsLotResult" ;
38-
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../efac:ProcurementDetails[2])) then replace(replace(replace(path(), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '_$1'), '/', '_') else replace(replace(replace(path(..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '_$1'), '/', '_'))" ;
38+
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../efac:ProcurementDetails[2])) then replace(replace(replace(path(), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_') else replace(replace(replace(path(..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_'))" ;
3939
rr:class epo:VehicleInformation
4040
] ;
4141
rr:predicateObjectMap
@@ -80,7 +80,7 @@ tedm:MG-VehicleInformation_ND-ProcurementStatistics a rr:TriplesMap ;
8080
rr:subjectMap
8181
[
8282
rdfs:label "ND-ProcurementStatistics" ;
83-
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../../efac:ProcurementDetails[2])) then path(..) else path(../..))" ;
83+
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../../efac:ProcurementDetails[2])) then replace(replace(replace(path(..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_') else replace(replace(replace(path(../..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_'))" ;
8484
rr:class epo:VehicleInformation
8585
] ;
8686
rr:predicateObjectMap

‎src/mappings-versioned/VehicleInformation-can_v1.3-1.12.rml.ttl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tedm:MG-VehicleInformation_ND-ProcurementDetailsLotResult a rr:TriplesMap ;
3535
rr:subjectMap
3636
[
3737
rdfs:label "ND-ProcurementDetailsLotResult" ;
38-
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../efac:ProcurementDetails[2])) then replace(replace(replace(path(), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '_$1'), '/', '_') else replace(replace(replace(path(..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '_$1'), '/', '_'))" ;
38+
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../efac:ProcurementDetails[2])) then replace(replace(replace(path(), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_') else replace(replace(replace(path(..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_'))" ;
3939
rr:class epo:VehicleInformation
4040
] ;
4141
rr:predicateObjectMap
@@ -83,7 +83,7 @@ tedm:MG-VehicleInformation_ND-ProcurementStatistics a rr:TriplesMap ;
8383
rr:subjectMap
8484
[
8585
rdfs:label "ND-ProcurementStatistics" ;
86-
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../../efac:ProcurementDetails[2])) then path(..) else path(../..))" ;
86+
rml:reference "'http://data.europa.eu/a4g/resource/id_' || replace(replace(/*/cbc:ID[@schemeName='notice-id'], ' ', '-' ), '/' , '-') || '_VehicleInformation_' || encode-for-uri(if (exists(../../efac:ProcurementDetails[2])) then replace(replace(replace(path(..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_') else replace(replace(replace(path(../..), 'Q\\{[^}]+\\}', ''), '\\[([0-9]+)\\]', '$1'), '/', '_'))" ;
8787
rr:class epo:VehicleInformation
8888
] ;
8989
rr:predicateObjectMap

‎src/output-versioned/can_24_maximal-1.10.ttl‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,7 @@ epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_LotAwardOutcome_RES-0001 a epo:LotAw
503503
epo:hasAwardStatus <http://publications.europa.eu/resource/authority/winner-selection-status/selec-w>;
504504
epo:hasFrameworkAgreementMaximumValue epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_FrameworkAgreementMaximumMonetaryValue__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_NoticeResult1_LotResult1_FrameworkAgreementValues1;
505505
rdfs:seeAlso epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_ReviewRequestSummary__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_NoticeResult1_LotResult1,
506-
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_NoticeResult1_LotResult1_StrategicProcurement1_StrategicProcurementInformation1,
507-
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation__ContractAwardNotice_1_UBLExtensions_1_UBLExtension_1_ExtensionContent_1_EformsExtension_1_NoticeResult_1_LotResult_1_StrategicProcurement_1_StrategicProcurementInformation_1 .
506+
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_NoticeResult1_LotResult1_StrategicProcurement1_StrategicProcurementInformation1 .
508507

509508
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_LotAwardOutcome_RES-0002 a epo:LotAwardOutcome;
510509
epo:comprisesTenderAwardOutcome epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TenderAwardOutcome_TEN-0003;
@@ -1256,23 +1255,29 @@ epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TouchPointAddress__ContractAwardNoti
12561255
locn:postName "London" .
12571256

12581257
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TouchPoint_TPO-0001 a cccev:ContactPoint;
1259-
epo:hasContactName "Head of Procurement Department";
1260-
epo:hasFax "+123 456789";
12611258
epo:hasInternetAddress "https://www.fin-adm.com"^^xsd:anyURI;
1262-
cccev:email "proc-info@fin-adm.com";
1263-
cccev:telephone "+123 45678";
12641259
dct:description "Procurement Department"@en;
12651260
locn:address epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TouchPointAddress__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_Organizations1_Organization1_TouchPoint1_PostalAddress1 .
12661261

12671262
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TouchPoint_TPO-0002 a cccev:ContactPoint;
1268-
epo:hasContactName "Proc Archives Dpt Lead";
1269-
epo:hasFax "+44 1234567769";
12701263
epo:hasInternetAddress "https://www.fin-adm.com"^^xsd:anyURI;
1271-
cccev:email "proc-archi@fin-adm.com";
1272-
cccev:telephone "+44 123456776";
12731264
dct:description "Fin Adm Archives"@en;
12741265
locn:address epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TouchPointAddress__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_Organizations1_Organization1_TouchPoint2_PostalAddress1 .
12751266

1267+
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TouchPoint__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_Organizations1_Organization1_TouchPoint1_Contact1
1268+
a cccev:ContactPoint;
1269+
epo:hasContactName "Head of Procurement Department";
1270+
epo:hasFax "+123 456789";
1271+
cccev:email "proc-info@fin-adm.com";
1272+
cccev:telephone "+123 45678" .
1273+
1274+
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_TouchPoint__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_Organizations1_Organization1_TouchPoint2_Contact1
1275+
a cccev:ContactPoint;
1276+
epo:hasContactName "Proc Archives Dpt Lead";
1277+
epo:hasFax "+44 1234567769";
1278+
cccev:email "proc-archi@fin-adm.com";
1279+
cccev:telephone "+44 123456776" .
1280+
12761281
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_UBOAddress__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_Organizations1_UltimateBeneficialOwner1_ResidenceAddress1
12771282
a locn:Address;
12781283
epo:hasCountryCode <http://publications.europa.eu/resource/authority/country/BEL>;
@@ -1281,12 +1286,6 @@ epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_UBOAddress__ContractAwardNotice1_UBL
12811286
locn:postCode "10123";
12821287
locn:postName "Bruxelles" .
12831288

1284-
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation_%2FQ%7Burn%3Aoasis%3Anames%3Aspecification%3Aubl%3Aschema%3Axsd%3AContractAwardNotice-2%7DContractAwardNotice%5B1%5D%2FQ%7Burn%3Aoasis%3Anames%3Aspecification%3Aubl%3Aschema%3Axsd%3ACommonExtensionComponents-2%7DUBLExtensions%5B1%5D%2FQ%7Burn%3Aoasis%3Anames%3Aspecification%3Aubl%3Aschema%3Axsd%3ACommonExtensionComponents-2%7DUBLExtension%5B1%5D%2FQ%7Burn%3Aoasis%3Anames%3Aspecification%3Aubl%3Aschema%3Axsd%3ACommonExtensionComponents-2%7DExtensionContent%5B1%5D%2FQ%7Bhttp%3A%2F%2Fdata.europa.eu%2Fp27%2Feforms-ubl-extensions%2F1%7DEformsExtension%5B1%5D%2FQ%7Bhttp%3A%2F%2Fdata.europa.eu%2Fp27%2Feforms-ubl-extension-aggregate-components%2F1%7DNoticeResult%5B1%5D%2FQ%7Bhttp%3A%2F%2Fdata.europa.eu%2Fp27%2Feforms-ubl-extension-aggregate-components%2F1%7DLotResult%5B1%5D%2FQ%7Bhttp%3A%2F%2Fdata.europa.eu%2Fp27%2Feforms-ubl-extension-aggregate-components%2F1%7DStrategicProcurement%5B1%5D%2FQ%7Bhttp%3A%2F%2Fdata.europa.eu%2Fp27%2Feforms-ubl-extension-aggregate-components%2F1%7DStrategicProcurementInformation%5B1%5D
1285-
a epo:VehicleInformation;
1286-
epo:hasCleanVehicles 10;
1287-
epo:hasTotalVehicles 45;
1288-
epo:hasZeroEmissionVehicles 2 .
1289-
12901289
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation__ContractAwardNotice1_ProcurementProjectLot2_TenderingTerms1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_StrategicProcurement1
12911290
a epo:VehicleInformation;
12921291
epo:concernsGreenProcurement epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_GreenProcurement__ContractAwardNotice1_ProcurementProjectLot2_TenderingTerms1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_StrategicProcurement1;
@@ -1295,11 +1294,10 @@ epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation__ContractAwardNot
12951294
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_NoticeResult1_LotResult1_StrategicProcurement1_StrategicProcurementInformation1
12961295
a epo:VehicleInformation;
12971296
epo:concernsGreenProcurement epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_GreenProcurement__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_NoticeResult1_LotResult1_StrategicProcurement1_StrategicProcurementInformation1;
1298-
epo:specifiesCleanVehicleDirectiveContractType <http://publications.europa.eu/resource/authority/cvd-contract-type/oth-serv-contr> .
1299-
1300-
epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_VehicleInformation__ContractAwardNotice_1_UBLExtensions_1_UBLExtension_1_ExtensionContent_1_EformsExtension_1_NoticeResult_1_LotResult_1_StrategicProcurement_1_StrategicProcurementInformation_1
1301-
a epo:VehicleInformation;
1302-
epo:concernsGreenProcurement epd:id_15377ca1-6cf7-4060-90f0-9290128957a3_GreenProcurement__ContractAwardNotice1_UBLExtensions1_UBLExtension1_ExtensionContent1_EformsExtension1_NoticeResult1_LotResult1_StrategicProcurement1_StrategicProcurementInformation1;
1297+
epo:hasCleanVehicles 10;
1298+
epo:hasTotalVehicles 45;
1299+
epo:hasZeroEmissionVehicles 2;
1300+
epo:specifiesCleanVehicleDirectiveContractType <http://publications.europa.eu/resource/authority/cvd-contract-type/oth-serv-contr>;
13031301
epo:specifiesCleanVehicleDirectiveVehicleCategory <http://publications.europa.eu/resource/authority/vehicle-category/n2-n3> .
13041302

13051303
epd:id_9c0fd704-64d3-4294-a3b6-6df45911ab9f-01_Notice a epo:PlanningNotice;

0 commit comments

Comments
 (0)