From 54e381bfad96b373475ba724b40d5d4e4c5f9452 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 5 Dec 2023 11:58:54 +0100 Subject: [PATCH 01/48] converted-date-to-datetime --- ...1205094320-mandaat-date-to-datetime.sparql | 110 ++++++++++++++++++ config/resources/domain.json | 10 +- 2 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql diff --git a/config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql new file mode 100644 index 0000000..0db4d31 --- /dev/null +++ b/config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql @@ -0,0 +1,110 @@ +PREFIX mandaat: +PREFIX ch: +PREFIX ere: +PREFIX xsd: +DELETE { + GRAPH ?g { + ?s mandaat:start ?o . + } +} +INSERT { + GRAPH ?g { + ?s mandaat:start ?converteddate . + } +} +WHERE { + GRAPH ?g { + ?s mandaat:start ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). +} +; +DELETE { + GRAPH ?g { + ?s mandaat:einde ?o . + } + } + INSERT { + GRAPH ?g { + ?s mandaat:einde ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s mandaat:einde ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } + +; +DELETE { + GRAPH ?g { + ?s ch:startdatum ?o . + } +} +INSERT { + GRAPH ?g { + ?s ch:startdatum ?converteddate . + } +} +WHERE { + GRAPH ?g { + ?s ch:startdatum ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). +} +; +DELETE { + GRAPH ?g { + ?s ch:eindedatum ?o . + } + } + INSERT { + GRAPH ?g { + ?s ch:eindedatum ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s ch:eindedatum ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } +; + DELETE { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?o . + } + } + INSERT { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } + ; \ No newline at end of file diff --git a/config/resources/domain.json b/config/resources/domain.json index 7a33825..5c67e33 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -92,11 +92,11 @@ "super": ["agents"], "attributes": { "agent-start-date": { - "type": "date", + "type": "datetime", "predicate": "ch:startdatum" }, "agent-end-date": { - "type": "date", + "type": "datetime", "predicate": "ch:eindedatum" } }, @@ -140,11 +140,11 @@ "super": ["agents-in-position"], "attributes": { "start-date": { - "type": "date", + "type": "datetime", "predicate": "mandaat:start" }, "end-date": { - "type": "date", + "type": "datetime", "predicate": "mandaat:einde" } }, @@ -188,7 +188,7 @@ "super": ["mandatories"], "attributes": { "expected-end-date": { - "type": "date", + "type": "datetime", "predicate": "ere:geplandeEinddatumAanstelling" }, "reason-stopped": { From 663c975725e718c8e82df17bf35625070fd1863c Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 19 Dec 2023 10:50:50 +0100 Subject: [PATCH 02/48] removed datetime to date conversions from reasoner --- config/reasoner/dl2op/main-info/mapping.n3 | 28 ------------ config/reasoner/dl2op/main/mapping.n3 | 53 ---------------------- 2 files changed, 81 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index ec1a9a1..4d7158b 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -68,34 +68,6 @@ PREFIX ere: }. # Test -# ex:s "2019-01-01T19:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:start ?startDateTime. - # use backward arrow rule defined below - ?startDateTime :dateFromDateTime ?startDate. - { - ?s mandaat:start ?startDateTime - } e:becomes { - ?s mandaat:start ?startDate - }. -} => { - ?s mandaat:start ?startDate -}. - -# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:einde ?eindeDateTime. - # use backward arrow rule defined below - ?eindeDateTime :dateFromDateTime ?eindeDate. - { - ?s mandaat:einde ?eindeDateTime - } e:becomes { - ?s mandaat:einde ?eindeDate - }. -} => { - ?s mandaat:einde ?eindeDate -}. - # Backward arrow rule is like a function call. # Removes time info in the returned date diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 0f79ceb..f280bf8 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -67,59 +67,6 @@ PREFIX lblodlg: }. # Test -# ex:s "2019-01-01T19:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:start ?startDateTime. - # use backward arrow rule defined below - ?startDateTime :dateFromDateTime ?startDate. - { - ?s mandaat:start ?startDateTime - } e:becomes { - ?s mandaat:start ?startDate - }. -} => { - ?s mandaat:start ?startDate -}. - -# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:einde ?eindeDateTime. - # use backward arrow rule defined below - ?eindeDateTime :dateFromDateTime ?eindeDate. - { - ?s mandaat:einde ?eindeDateTime - } e:becomes { - ?s mandaat:einde ?eindeDate - }. -} => { - ?s mandaat:einde ?eindeDate -}. - -{ - ?s mandaat:bindingStart ?bindingStartDateTime. - # use backward arrow rule defined below - ?bindingStartDateTime :dateFromDateTime ?bindingStartDate. - { - ?s mandaat:bindingStart ?bindingStartDateTime - } e:becomes { - ?s mandaat:bindingStart ?bindingStartDate - }. -} => { - ?s mandaat:bindingStart ?bindingStartDate -}. - -{ - ?s mandaat:bindingEinde ?bindingEindeDateTime. - # use backward arrow rule defined below - ?bindingEindeDateTime :dateFromDateTime ?bindingEindeDate. - { - ?s mandaat:bindingEinde ?bindingEindeDateTime - } e:becomes { - ?s mandaat:bindingEinde ?bindingEindeDate - }. -} => { - ?s mandaat:bindingEinde ?bindingEindeDate -}. # Backward arrow rule is like a function call. # Removes time info in the returned date From 329e87f0ebad9cc58b969cc70d2525d912c64868 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 5 Dec 2023 11:58:54 +0100 Subject: [PATCH 03/48] converted-date-to-datetime --- ...1205094320-mandaat-date-to-datetime.sparql | 110 ++++++++++++++++++ config/resources/domain.json | 10 +- 2 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql diff --git a/config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql new file mode 100644 index 0000000..0db4d31 --- /dev/null +++ b/config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql @@ -0,0 +1,110 @@ +PREFIX mandaat: +PREFIX ch: +PREFIX ere: +PREFIX xsd: +DELETE { + GRAPH ?g { + ?s mandaat:start ?o . + } +} +INSERT { + GRAPH ?g { + ?s mandaat:start ?converteddate . + } +} +WHERE { + GRAPH ?g { + ?s mandaat:start ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). +} +; +DELETE { + GRAPH ?g { + ?s mandaat:einde ?o . + } + } + INSERT { + GRAPH ?g { + ?s mandaat:einde ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s mandaat:einde ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } + +; +DELETE { + GRAPH ?g { + ?s ch:startdatum ?o . + } +} +INSERT { + GRAPH ?g { + ?s ch:startdatum ?converteddate . + } +} +WHERE { + GRAPH ?g { + ?s ch:startdatum ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). +} +; +DELETE { + GRAPH ?g { + ?s ch:eindedatum ?o . + } + } + INSERT { + GRAPH ?g { + ?s ch:eindedatum ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s ch:eindedatum ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } +; + DELETE { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?o . + } + } + INSERT { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } + ; \ No newline at end of file diff --git a/config/resources/domain.json b/config/resources/domain.json index 7a33825..5c67e33 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -92,11 +92,11 @@ "super": ["agents"], "attributes": { "agent-start-date": { - "type": "date", + "type": "datetime", "predicate": "ch:startdatum" }, "agent-end-date": { - "type": "date", + "type": "datetime", "predicate": "ch:eindedatum" } }, @@ -140,11 +140,11 @@ "super": ["agents-in-position"], "attributes": { "start-date": { - "type": "date", + "type": "datetime", "predicate": "mandaat:start" }, "end-date": { - "type": "date", + "type": "datetime", "predicate": "mandaat:einde" } }, @@ -188,7 +188,7 @@ "super": ["mandatories"], "attributes": { "expected-end-date": { - "type": "date", + "type": "datetime", "predicate": "ere:geplandeEinddatumAanstelling" }, "reason-stopped": { From 70e79734df5453c7b074380d9060edec496b999b Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 19 Dec 2023 10:50:50 +0100 Subject: [PATCH 04/48] removed datetime to date conversions from reasoner --- config/reasoner/dl2op/main-info/mapping.n3 | 28 ------------ config/reasoner/dl2op/main/mapping.n3 | 53 ---------------------- 2 files changed, 81 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index ec1a9a1..4d7158b 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -68,34 +68,6 @@ PREFIX ere: }. # Test -# ex:s "2019-01-01T19:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:start ?startDateTime. - # use backward arrow rule defined below - ?startDateTime :dateFromDateTime ?startDate. - { - ?s mandaat:start ?startDateTime - } e:becomes { - ?s mandaat:start ?startDate - }. -} => { - ?s mandaat:start ?startDate -}. - -# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:einde ?eindeDateTime. - # use backward arrow rule defined below - ?eindeDateTime :dateFromDateTime ?eindeDate. - { - ?s mandaat:einde ?eindeDateTime - } e:becomes { - ?s mandaat:einde ?eindeDate - }. -} => { - ?s mandaat:einde ?eindeDate -}. - # Backward arrow rule is like a function call. # Removes time info in the returned date diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 0f79ceb..f280bf8 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -67,59 +67,6 @@ PREFIX lblodlg: }. # Test -# ex:s "2019-01-01T19:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:start ?startDateTime. - # use backward arrow rule defined below - ?startDateTime :dateFromDateTime ?startDate. - { - ?s mandaat:start ?startDateTime - } e:becomes { - ?s mandaat:start ?startDate - }. -} => { - ?s mandaat:start ?startDate -}. - -# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:einde ?eindeDateTime. - # use backward arrow rule defined below - ?eindeDateTime :dateFromDateTime ?eindeDate. - { - ?s mandaat:einde ?eindeDateTime - } e:becomes { - ?s mandaat:einde ?eindeDate - }. -} => { - ?s mandaat:einde ?eindeDate -}. - -{ - ?s mandaat:bindingStart ?bindingStartDateTime. - # use backward arrow rule defined below - ?bindingStartDateTime :dateFromDateTime ?bindingStartDate. - { - ?s mandaat:bindingStart ?bindingStartDateTime - } e:becomes { - ?s mandaat:bindingStart ?bindingStartDate - }. -} => { - ?s mandaat:bindingStart ?bindingStartDate -}. - -{ - ?s mandaat:bindingEinde ?bindingEindeDateTime. - # use backward arrow rule defined below - ?bindingEindeDateTime :dateFromDateTime ?bindingEindeDate. - { - ?s mandaat:bindingEinde ?bindingEindeDateTime - } e:becomes { - ?s mandaat:bindingEinde ?bindingEindeDate - }. -} => { - ?s mandaat:bindingEinde ?bindingEindeDate -}. # Backward arrow rule is like a function call. # Removes time info in the returned date From e8061f6a0bf173b77deabff790d5500ac17504f1 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 19 Dec 2023 11:01:02 +0100 Subject: [PATCH 05/48] commit --- ...1205094322-mandaat-date-to-datetime.sparql | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql diff --git a/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql new file mode 100644 index 0000000..0db4d31 --- /dev/null +++ b/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql @@ -0,0 +1,110 @@ +PREFIX mandaat: +PREFIX ch: +PREFIX ere: +PREFIX xsd: +DELETE { + GRAPH ?g { + ?s mandaat:start ?o . + } +} +INSERT { + GRAPH ?g { + ?s mandaat:start ?converteddate . + } +} +WHERE { + GRAPH ?g { + ?s mandaat:start ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). +} +; +DELETE { + GRAPH ?g { + ?s mandaat:einde ?o . + } + } + INSERT { + GRAPH ?g { + ?s mandaat:einde ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s mandaat:einde ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } + +; +DELETE { + GRAPH ?g { + ?s ch:startdatum ?o . + } +} +INSERT { + GRAPH ?g { + ?s ch:startdatum ?converteddate . + } +} +WHERE { + GRAPH ?g { + ?s ch:startdatum ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). +} +; +DELETE { + GRAPH ?g { + ?s ch:eindedatum ?o . + } + } + INSERT { + GRAPH ?g { + ?s ch:eindedatum ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s ch:eindedatum ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } +; + DELETE { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?o . + } + } + INSERT { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s ere:geplandeEinddatumAanstelling ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } + ; \ No newline at end of file From 11105113a9e184ff64b08e9ad44ed361716bf678 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Fri, 22 Dec 2023 10:46:37 +0100 Subject: [PATCH 06/48] added backwards arrow rule to reasoner --- ...1205094322-mandaat-date-to-datetime.sparql | 110 ------------------ ...205094323-mandaat-date-to-datetime.sparql} | 0 config/reasoner/dl2op/main-info/mapping.n3 | 89 +++++++++++++- config/reasoner/dl2op/main/mapping.n3 | 88 ++++++++++++++ 4 files changed, 176 insertions(+), 111 deletions(-) delete mode 100644 config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql rename config/migrations/2023/{20231205094320-mandaat-date-to-datetime.sparql => 20231205094323-mandaat-date-to-datetime.sparql} (100%) diff --git a/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql deleted file mode 100644 index 0db4d31..0000000 --- a/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql +++ /dev/null @@ -1,110 +0,0 @@ -PREFIX mandaat: -PREFIX ch: -PREFIX ere: -PREFIX xsd: -DELETE { - GRAPH ?g { - ?s mandaat:start ?o . - } -} -INSERT { - GRAPH ?g { - ?s mandaat:start ?converteddate . - } -} -WHERE { - GRAPH ?g { - ?s mandaat:start ?o . - } - VALUES ?g { - - - } - BIND(xsd:dateTime(?o) AS ?converteddate). -} -; -DELETE { - GRAPH ?g { - ?s mandaat:einde ?o . - } - } - INSERT { - GRAPH ?g { - ?s mandaat:einde ?converteddate . - } - } - WHERE { - GRAPH ?g { - ?s mandaat:einde ?o . - } - VALUES ?g { - - - } - BIND(xsd:dateTime(?o) AS ?converteddate). - } - -; -DELETE { - GRAPH ?g { - ?s ch:startdatum ?o . - } -} -INSERT { - GRAPH ?g { - ?s ch:startdatum ?converteddate . - } -} -WHERE { - GRAPH ?g { - ?s ch:startdatum ?o . - } - VALUES ?g { - - - } - BIND(xsd:dateTime(?o) AS ?converteddate). -} -; -DELETE { - GRAPH ?g { - ?s ch:eindedatum ?o . - } - } - INSERT { - GRAPH ?g { - ?s ch:eindedatum ?converteddate . - } - } - WHERE { - GRAPH ?g { - ?s ch:eindedatum ?o . - } - VALUES ?g { - - - } - BIND(xsd:dateTime(?o) AS ?converteddate). - } -; - DELETE { - GRAPH ?g { - ?s ere:geplandeEinddatumAanstelling ?o . - } - } - INSERT { - GRAPH ?g { - ?s ere:geplandeEinddatumAanstelling ?converteddate . - } - } - WHERE { - GRAPH ?g { - ?s ere:geplandeEinddatumAanstelling ?o . - } - VALUES ?g { - - - } - BIND(xsd:dateTime(?o) AS ?converteddate). - } - ; \ No newline at end of file diff --git a/config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094323-mandaat-date-to-datetime.sparql similarity index 100% rename from config/migrations/2023/20231205094320-mandaat-date-to-datetime.sparql rename to config/migrations/2023/20231205094323-mandaat-date-to-datetime.sparql diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 4d7158b..201724c 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -68,6 +68,84 @@ PREFIX ere: }. # Test +# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. +{ + ?s mandaat:einde ?eindeDateTime. + # use backward arrow rule defined below + ?eindeDateTime :dateFromDateTime ?eindeDate. + { + ?s mandaat:einde ?eindeDateTime + } e:becomes { + ?s mandaat:einde ?eindeDate + }. +} => { + ?s mandaat:einde ?eindeDate +}. + +{ + ?s mandaat:bindingStart ?bindingStartDateTime. + # use backward arrow rule defined below + ?bindingStartDateTime :dateFromDateTime ?bindingStartDate. + { + ?s mandaat:bindingStart ?bindingStartDateTime + } e:becomes { + ?s mandaat:bindingStart ?bindingStartDate + }. +} => { + ?s mandaat:bindingStart ?bindingStartDate +}. + +{ + ?s mandaat:bindingEinde ?bindingEindeDateTime. + # use backward arrow rule defined below + ?bindingEindeDateTime :dateFromDateTime ?bindingEindeDate. + { + ?s mandaat:bindingEinde ?bindingEindeDateTime + } e:becomes { + ?s mandaat:bindingEinde ?bindingEindeDate + }. +} => { + ?s mandaat:bindingEinde ?bindingEindeDate +}. + +{ + ?s ch:startdatum ?startDate. + # use backward arrow rule defined below + ?startDate :dateFromDateTime ?startDateTime. + { + ?s ch:startdatum ?startDate + } e:becomes { + ?s ch:startdatum ?startDateTime + }. +} => { + ?s ch:startdatum ?startDateTime +}. + +{ + ?s ch:eindedatum ?startDDate. + # use backward arrow rule defined below + ?startDate :dateFromDateTime ?startDateTime. + { + ?s ch:eindedatum ?startDate + } e:becomes { + ?s ch:eindedatum ?startDateTime + }. +} => { + ?s ch:eindedatum ?startDateTime +}. + +{ + ?s ere:geplandeEinddatumAanstelling ?startDDate. + # use backward arrow rule defined below + ?startDate :dateFromDateTime ?startDateTime. + { + ?s ere:geplandeEinddatumAanstelling ?startDate + } e:becomes { + ?s ere:geplandeEinddatumAanstelling ?startDateTime + }. +} => { + ?s ere:geplandeEinddatumAanstelling ?startDateTime +}. # Backward arrow rule is like a function call. # Removes time info in the returned date @@ -85,10 +163,19 @@ PREFIX ere: (?dateTimeLiteral xsd:dateTime) log:dtlit ?dateTime. (?dateTime "PT2H"^^xsd:dayTimeDuration) func:add-dayTimeDuration-to-dateTime ?localDateTime. (?localDateTimeLiteral xsd:dateTime) log:dtlit ?localDateTime. - (?localDateTimeLiteral 0 11) func:substring ?dateLiteral. (?dateLiteral xsd:date) log:dtlit ?date. }. +#backwards arrow rule for converting date to datetime +{ + ?date :dateTimeFromDate ?dateTime +} <= { + ?date string:notMatches """^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).*""" . + (?date "T00:00:00") string:concatenation ?datePlusTime. + (?datePlusTime xsd:dateTime) log:dtlit ?dateTime +}. + + # ex:orgA besluit:classificatie . { diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index f280bf8..2b506ca 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -67,6 +67,85 @@ PREFIX lblodlg: }. # Test +# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. +{ + ?s mandaat:einde ?eindeDateTime. + # use backward arrow rule defined below + ?eindeDateTime :dateFromDateTime ?eindeDate. + { + ?s mandaat:einde ?eindeDateTime + } e:becomes { + ?s mandaat:einde ?eindeDate + }. +} => { + ?s mandaat:einde ?eindeDate +}. + +{ + ?s mandaat:bindingStart ?bindingStartDateTime. + # use backward arrow rule defined below + ?bindingStartDateTime :dateFromDateTime ?bindingStartDate. + { + ?s mandaat:bindingStart ?bindingStartDateTime + } e:becomes { + ?s mandaat:bindingStart ?bindingStartDate + }. +} => { + ?s mandaat:bindingStart ?bindingStartDate +}. + +{ + ?s mandaat:bindingEinde ?bindingEindeDateTime. + # use backward arrow rule defined below + ?bindingEindeDateTime :dateFromDateTime ?bindingEindeDate. + { + ?s mandaat:bindingEinde ?bindingEindeDateTime + } e:becomes { + ?s mandaat:bindingEinde ?bindingEindeDate + }. +} => { + ?s mandaat:bindingEinde ?bindingEindeDate +}. + +{ + ?s ch:startdatum ?startDate. + # use backward arrow rule defined below + ?startDate :dateFromDateTime ?startDateTime. + { + ?s ch:startdatum ?startDate + } e:becomes { + ?s ch:startdatum ?startDateTime + }. +} => { + ?s ch:startdatum ?startDateTime +}. + +{ + ?s ch:eindedatum ?startDDate. + # use backward arrow rule defined below + ?startDate :dateFromDateTime ?startDateTime. + { + ?s ch:eindedatum ?startDate + } e:becomes { + ?s ch:eindedatum ?startDateTime + }. +} => { + ?s ch:eindedatum ?startDateTime +}. + +{ + ?s ere:geplandeEinddatumAanstelling ?startDDate. + # use backward arrow rule defined below + ?startDate :dateFromDateTime ?startDateTime. + { + ?s ere:geplandeEinddatumAanstelling ?startDate + } e:becomes { + ?s ere:geplandeEinddatumAanstelling ?startDateTime + }. +} => { + ?s ere:geplandeEinddatumAanstelling ?startDateTime +}. + # Backward arrow rule is like a function call. # Removes time info in the returned date @@ -88,6 +167,15 @@ PREFIX lblodlg: (?dateLiteral xsd:date) log:dtlit ?date. }. +#backwards arrow rule for converting date to datetime +{ + ?date :dateTimeFromDate ?dateTime +} <= { + ?date string:notMatches """^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).*""" . + (?date "T00:00:00") string:concatenation ?datePlusTime. + (?datePlusTime xsd:dateTime) log:dtlit ?dateTime +}. + # ex:orgA besluit:classificatie . { From 6fae30d24596990e9d966b5a67c4eae1ea836c0c Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 2 Jan 2024 12:18:16 +0100 Subject: [PATCH 07/48] fixed typo --- config/reasoner/dl2op/main/mapping.n3 | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 2b506ca..33ec1bf 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -71,7 +71,7 @@ PREFIX lblodlg: { ?s mandaat:einde ?eindeDateTime. # use backward arrow rule defined below - ?eindeDateTime :dateFromDateTime ?eindeDate. + ?eindeDateTime :dateTimeFromDate ?eindeDate. { ?s mandaat:einde ?eindeDateTime } e:becomes { @@ -110,7 +110,7 @@ PREFIX lblodlg: { ?s ch:startdatum ?startDate. # use backward arrow rule defined below - ?startDate :dateFromDateTime ?startDateTime. + ?startDate :dateTimeFromDate ?startDateTime. { ?s ch:startdatum ?startDate } e:becomes { @@ -121,9 +121,9 @@ PREFIX lblodlg: }. { - ?s ch:eindedatum ?startDDate. + ?s ch:eindedatum ?startDate. # use backward arrow rule defined below - ?startDate :dateFromDateTime ?startDateTime. + ?startDate :dateTimeFromDate ?startDateTime. { ?s ch:eindedatum ?startDate } e:becomes { @@ -133,19 +133,6 @@ PREFIX lblodlg: ?s ch:eindedatum ?startDateTime }. -{ - ?s ere:geplandeEinddatumAanstelling ?startDDate. - # use backward arrow rule defined below - ?startDate :dateFromDateTime ?startDateTime. - { - ?s ere:geplandeEinddatumAanstelling ?startDate - } e:becomes { - ?s ere:geplandeEinddatumAanstelling ?startDateTime - }. -} => { - ?s ere:geplandeEinddatumAanstelling ?startDateTime -}. - # Backward arrow rule is like a function call. # Removes time info in the returned date From 76784840a444306927127a7689f721d4b77764fe Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 4 Jan 2024 16:21:01 +0100 Subject: [PATCH 08/48] removed rule for mandaat because it's already datetime --- config/reasoner/dl2op/main-info/mapping.n3 | 17 ++--------------- config/reasoner/dl2op/main/mapping.n3 | 13 ------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 201724c..cc473d4 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -69,19 +69,6 @@ PREFIX ere: # Test # ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:einde ?eindeDateTime. - # use backward arrow rule defined below - ?eindeDateTime :dateFromDateTime ?eindeDate. - { - ?s mandaat:einde ?eindeDateTime - } e:becomes { - ?s mandaat:einde ?eindeDate - }. -} => { - ?s mandaat:einde ?eindeDate -}. - { ?s mandaat:bindingStart ?bindingStartDateTime. # use backward arrow rule defined below @@ -122,7 +109,7 @@ PREFIX ere: }. { - ?s ch:eindedatum ?startDDate. + ?s ch:eindedatum ?startDate. # use backward arrow rule defined below ?startDate :dateFromDateTime ?startDateTime. { @@ -135,7 +122,7 @@ PREFIX ere: }. { - ?s ere:geplandeEinddatumAanstelling ?startDDate. + ?s ere:geplandeEinddatumAanstelling ?startDate. # use backward arrow rule defined below ?startDate :dateFromDateTime ?startDateTime. { diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 33ec1bf..71b7a4a 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -68,19 +68,6 @@ PREFIX lblodlg: # Test # ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:einde ?eindeDateTime. - # use backward arrow rule defined below - ?eindeDateTime :dateTimeFromDate ?eindeDate. - { - ?s mandaat:einde ?eindeDateTime - } e:becomes { - ?s mandaat:einde ?eindeDate - }. -} => { - ?s mandaat:einde ?eindeDate -}. - { ?s mandaat:bindingStart ?bindingStartDateTime. # use backward arrow rule defined below From a53f0d3f30a4e206dfa0dafdcb26186c84c135f6 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 9 Jan 2024 11:35:42 +0100 Subject: [PATCH 09/48] fixed copy paste errors... --- ...205094322-mandaat-date-to-datetime.sparql} | 0 config/reasoner/dl2op/main-info/mapping.n3 | 22 +++++++++---------- config/reasoner/dl2op/main/mapping.n3 | 10 ++++----- 3 files changed, 16 insertions(+), 16 deletions(-) rename config/migrations/2023/{20231205094323-mandaat-date-to-datetime.sparql => 20231205094322-mandaat-date-to-datetime.sparql} (100%) diff --git a/config/migrations/2023/20231205094323-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql similarity index 100% rename from config/migrations/2023/20231205094323-mandaat-date-to-datetime.sparql rename to config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index cc473d4..a22239e 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -98,7 +98,7 @@ PREFIX ere: { ?s ch:startdatum ?startDate. # use backward arrow rule defined below - ?startDate :dateFromDateTime ?startDateTime. + ?startDate :dateTimeFromDate ?startDateTime. { ?s ch:startdatum ?startDate } e:becomes { @@ -109,29 +109,29 @@ PREFIX ere: }. { - ?s ch:eindedatum ?startDate. + ?s ch:eindedatum ?endDate. # use backward arrow rule defined below - ?startDate :dateFromDateTime ?startDateTime. + ?endDate :dateTimeFromDate ?endDateTime. { - ?s ch:eindedatum ?startDate + ?s ch:eindedatum ?endDate } e:becomes { - ?s ch:eindedatum ?startDateTime + ?s ch:eindedatum ?endDateTime }. } => { - ?s ch:eindedatum ?startDateTime + ?s ch:eindedatum ?endDateTime }. { - ?s ere:geplandeEinddatumAanstelling ?startDate. + ?s ere:geplandeEinddatumAanstelling ?endDate. # use backward arrow rule defined below - ?startDate :dateFromDateTime ?startDateTime. + ?endDate :dateTimeFromDate ?endDateTime. { - ?s ere:geplandeEinddatumAanstelling ?startDate + ?s ere:geplandeEinddatumAanstelling ?endDate } e:becomes { - ?s ere:geplandeEinddatumAanstelling ?startDateTime + ?s ere:geplandeEinddatumAanstelling ?endDateTime }. } => { - ?s ere:geplandeEinddatumAanstelling ?startDateTime + ?s ere:geplandeEinddatumAanstelling ?endDateTime }. # Backward arrow rule is like a function call. diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 71b7a4a..8aacb8d 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -108,16 +108,16 @@ PREFIX lblodlg: }. { - ?s ch:eindedatum ?startDate. + ?s ch:eindedatum ?endDate. # use backward arrow rule defined below - ?startDate :dateTimeFromDate ?startDateTime. + ?endDate :dateTimeFromDate ?endDateTime. { - ?s ch:eindedatum ?startDate + ?s ch:eindedatum ?endDate } e:becomes { - ?s ch:eindedatum ?startDateTime + ?s ch:eindedatum ?endDateTime }. } => { - ?s ch:eindedatum ?startDateTime + ?s ch:eindedatum ?endDateTime }. From 97c1929346d4286d6c60c7c60a83116fb7c56969 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 10 Jan 2024 14:48:10 +0100 Subject: [PATCH 10/48] re;oved bindingstart and eindedatum from mapping + added conversions to migrations --- ...205094325-mandaat-date-to-datetime.sparql} | 43 ++++++++++++++++++- config/reasoner/dl2op/main-info/mapping.n3 | 28 ------------ config/reasoner/dl2op/main/mapping.n3 | 25 ----------- 3 files changed, 42 insertions(+), 54 deletions(-) rename config/migrations/2023/{20231205094322-mandaat-date-to-datetime.sparql => 20231205094325-mandaat-date-to-datetime.sparql} (72%) diff --git a/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094325-mandaat-date-to-datetime.sparql similarity index 72% rename from config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql rename to config/migrations/2023/20231205094325-mandaat-date-to-datetime.sparql index 0db4d31..0b7c557 100644 --- a/config/migrations/2023/20231205094322-mandaat-date-to-datetime.sparql +++ b/config/migrations/2023/20231205094325-mandaat-date-to-datetime.sparql @@ -43,7 +43,48 @@ DELETE { } BIND(xsd:dateTime(?o) AS ?converteddate). } - +; +DELETE { + GRAPH ?g { + ?s mandaat:bindingStart ?o . + } + } + INSERT { + GRAPH ?g { + ?s mandaat:bindingStart ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s mandaat:bindingStart ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } +; +DELETE { + GRAPH ?g { + ?s mandaat:bindingEinde ?o . + } + } + INSERT { + GRAPH ?g { + ?s mandaat:bindingEinde ?converteddate . + } + } + WHERE { + GRAPH ?g { + ?s mandaat:bindingEinde ?o . + } + VALUES ?g { + + + } + BIND(xsd:dateTime(?o) AS ?converteddate). + } ; DELETE { GRAPH ?g { diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index a22239e..088e0bf 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -67,34 +67,6 @@ PREFIX ere: ?s persoon:gebruikteVoornaam ?o }. -# Test -# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:bindingStart ?bindingStartDateTime. - # use backward arrow rule defined below - ?bindingStartDateTime :dateFromDateTime ?bindingStartDate. - { - ?s mandaat:bindingStart ?bindingStartDateTime - } e:becomes { - ?s mandaat:bindingStart ?bindingStartDate - }. -} => { - ?s mandaat:bindingStart ?bindingStartDate -}. - -{ - ?s mandaat:bindingEinde ?bindingEindeDateTime. - # use backward arrow rule defined below - ?bindingEindeDateTime :dateFromDateTime ?bindingEindeDate. - { - ?s mandaat:bindingEinde ?bindingEindeDateTime - } e:becomes { - ?s mandaat:bindingEinde ?bindingEindeDate - }. -} => { - ?s mandaat:bindingEinde ?bindingEindeDate -}. - { ?s ch:startdatum ?startDate. # use backward arrow rule defined below diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 8aacb8d..89ca847 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -68,31 +68,6 @@ PREFIX lblodlg: # Test # ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. -{ - ?s mandaat:bindingStart ?bindingStartDateTime. - # use backward arrow rule defined below - ?bindingStartDateTime :dateFromDateTime ?bindingStartDate. - { - ?s mandaat:bindingStart ?bindingStartDateTime - } e:becomes { - ?s mandaat:bindingStart ?bindingStartDate - }. -} => { - ?s mandaat:bindingStart ?bindingStartDate -}. - -{ - ?s mandaat:bindingEinde ?bindingEindeDateTime. - # use backward arrow rule defined below - ?bindingEindeDateTime :dateFromDateTime ?bindingEindeDate. - { - ?s mandaat:bindingEinde ?bindingEindeDateTime - } e:becomes { - ?s mandaat:bindingEinde ?bindingEindeDate - }. -} => { - ?s mandaat:bindingEinde ?bindingEindeDate -}. { ?s ch:startdatum ?startDate. From e414a9e0868acedd312c692e33cc00ee06f91fc2 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 18 Jan 2024 14:59:14 +0100 Subject: [PATCH 11/48] replaced orignal backwards arrowrule with new rule --- config/reasoner/dl2op/main-info/mapping.n3 | 41 ++++++++++++++++------ config/reasoner/dl2op/main/mapping.n3 | 40 ++++++++++++++------- 2 files changed, 57 insertions(+), 24 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 088e0bf..36c4585 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -67,6 +67,35 @@ PREFIX ere: ?s persoon:gebruikteVoornaam ?o }. + +# Test +# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. +{ + ?s mandaat:bindingeinde ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:bindingeinde ?eindeDate + } e:becomes { + ?s mandaat:bindingeinde ?eindeDateTime + }. +} => { + ?s mandaat:bindingeinde ?eindeDateTime +}. + + +{ + ?s mandaat:bindingstart ?startDate. + # use backward arrow rule defined below + ?startDate :dateTimeFromDate ?startDateTime. + { + ?s mandaat:bindingstart ?startDate + } e:becomes { + ?s mandaat:bindingstart ?startDateTime + }. +} => { + ?s mandaat:bindingstart ?startDateTime +}. { ?s ch:startdatum ?startDate. # use backward arrow rule defined below @@ -119,17 +148,7 @@ PREFIX ere: { ?dateTime :dateFromDateTime ?date } <= { - (?dateTimeLiteral xsd:dateTime) log:dtlit ?dateTime. - (?dateTime "PT2H"^^xsd:dayTimeDuration) func:add-dayTimeDuration-to-dateTime ?localDateTime. - (?localDateTimeLiteral xsd:dateTime) log:dtlit ?localDateTime. - (?dateLiteral xsd:date) log:dtlit ?date. -}. - -#backwards arrow rule for converting date to datetime -{ - ?date :dateTimeFromDate ?dateTime -} <= { - ?date string:notMatches """^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).*""" . + ?date string:notMatches """^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).*""" . (?date "T00:00:00") string:concatenation ?datePlusTime. (?datePlusTime xsd:dateTime) log:dtlit ?dateTime }. diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 89ca847..310f9c1 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -68,6 +68,32 @@ PREFIX lblodlg: # Test # ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. +{ + ?s mandaat:bindingeinde ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:bindingeinde ?eindeDate + } e:becomes { + ?s mandaat:bindingeinde ?eindeDateTime + }. +} => { + ?s mandaat:bindingeinde ?eindeDateTime +}. + + +{ + ?s mandaat:bindingstart ?startDate. + # use backward arrow rule defined below + ?startDate :dateTimeFromDate ?startDateTime. + { + ?s mandaat:bindingstart ?startDate + } e:becomes { + ?s mandaat:bindingstart ?startDateTime + }. +} => { + ?s mandaat:bindingstart ?startDateTime +}. { ?s ch:startdatum ?startDate. @@ -107,25 +133,13 @@ PREFIX lblodlg: # So, the following rule adds 2 hours to the datetime, and then takes the date part of the UTC date time # to come to the date that the DL user selected (in CE(S)T) { - ?dateTime :dateFromDateTime ?date -} <= { - (?dateTimeLiteral xsd:dateTime) log:dtlit ?dateTime. - (?dateTime "PT2H"^^xsd:dayTimeDuration) func:add-dayTimeDuration-to-dateTime ?localDateTime. - (?localDateTimeLiteral xsd:dateTime) log:dtlit ?localDateTime. - (?localDateTimeLiteral 0 11) func:substring ?dateLiteral. - (?dateLiteral xsd:date) log:dtlit ?date. -}. - -#backwards arrow rule for converting date to datetime -{ - ?date :dateTimeFromDate ?dateTime + ?dateTime :dateTimeFromDate ?date } <= { ?date string:notMatches """^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).*""" . (?date "T00:00:00") string:concatenation ?datePlusTime. (?datePlusTime xsd:dateTime) log:dtlit ?dateTime }. - # ex:orgA besluit:classificatie . { { From 3bef65188ceac7e73e015a5985dc1d5a40e84431 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 18 Jan 2024 15:05:33 +0100 Subject: [PATCH 12/48] fixed migration accordingly due to bug in virtuoso --- ...20231205094344-mandaat-date-to-datetime.sparql} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename config/migrations/2023/{20231205094325-mandaat-date-to-datetime.sparql => 20231205094344-mandaat-date-to-datetime.sparql} (76%) diff --git a/config/migrations/2023/20231205094325-mandaat-date-to-datetime.sparql b/config/migrations/2023/20231205094344-mandaat-date-to-datetime.sparql similarity index 76% rename from config/migrations/2023/20231205094325-mandaat-date-to-datetime.sparql rename to config/migrations/2023/20231205094344-mandaat-date-to-datetime.sparql index 0b7c557..6e81b83 100644 --- a/config/migrations/2023/20231205094325-mandaat-date-to-datetime.sparql +++ b/config/migrations/2023/20231205094344-mandaat-date-to-datetime.sparql @@ -20,7 +20,7 @@ WHERE { } - BIND(xsd:dateTime(?o) AS ?converteddate). + BIND(IF(strlen(str(?o)) = 10, strdt(concat(str(?o), 'T02:00:00'), xsd:dateTime), ?o) as ?converteddate). } ; DELETE { @@ -41,7 +41,7 @@ DELETE { } - BIND(xsd:dateTime(?o) AS ?converteddate). + BIND(IF(strlen(str(?o)) = 10, strdt(concat(str(?o), 'T02:00:00'), xsd:dateTime), ?o) as ?converteddate). } ; DELETE { @@ -62,7 +62,7 @@ DELETE { } - BIND(xsd:dateTime(?o) AS ?converteddate). + BIND(IF(strlen(str(?o)) = 10, strdt(concat(str(?o), 'T02:00:00'), xsd:dateTime), ?o) as ?converteddate). } ; DELETE { @@ -83,7 +83,7 @@ DELETE { } - BIND(xsd:dateTime(?o) AS ?converteddate). + BIND(IF(strlen(str(?o)) = 10, strdt(concat(str(?o), 'T02:00:00'), xsd:dateTime), ?o) as ?converteddate). } ; DELETE { @@ -104,7 +104,7 @@ WHERE { } - BIND(xsd:dateTime(?o) AS ?converteddate). + BIND(IF(strlen(str(?o)) = 10, strdt(concat(str(?o), 'T02:00:00'), xsd:dateTime), ?o) as ?converteddate). } ; DELETE { @@ -125,7 +125,7 @@ DELETE { } - BIND(xsd:dateTime(?o) AS ?converteddate). + BIND(IF(strlen(str(?o)) = 10, strdt(concat(str(?o), 'T02:00:00'), xsd:dateTime), ?o) as ?converteddate). } ; DELETE { @@ -146,6 +146,6 @@ DELETE { } - BIND(xsd:dateTime(?o) AS ?converteddate). + BIND(IF(strlen(str(?o)) = 10, strdt(concat(str(?o), 'T02:00:00'), xsd:dateTime), ?o) as ?converteddate). } ; \ No newline at end of file From c5888b8f8d1fd6435189302673da543a10c75884 Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 20 Feb 2024 14:37:36 +0100 Subject: [PATCH 13/48] Chore: bump mu-cl-resources to latest version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 04ed4ab..f2af463 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,7 +72,7 @@ services: restart: always logging: *default-logging resource: - image: semtech/mu-cl-resources:feature-optional-native-booleans + image: semtech/mu-cl-resources:1.23.0 environment: CACHE_CLEAR_PATH: "http://cache/.mu/clear-keys" links: From 1fc6a43e9c9183a91042c1375fd97f63c5aed5d7 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Tue, 27 Feb 2024 15:21:39 +0100 Subject: [PATCH 14/48] chore: Add migration samples --- config/migrations-sample/README.md | 13 ++ .../pseudonimyze-data.sparql-template | 149 ++++++++++++++++++ config/migrations/local/.gitkeep | 0 config/migrations/local/README.md | 3 + 4 files changed, 165 insertions(+) create mode 100644 config/migrations-sample/README.md create mode 100644 config/migrations-sample/pseudonimyze-data.sparql-template create mode 100644 config/migrations/local/.gitkeep create mode 100644 config/migrations/local/README.md diff --git a/config/migrations-sample/README.md b/config/migrations-sample/README.md new file mode 100644 index 0000000..d2e79fa --- /dev/null +++ b/config/migrations-sample/README.md @@ -0,0 +1,13 @@ +# Motivation + +This folder contains migration files that are typically executed on an as-needed, or ad hoc, basis. +In addition, these files can function as templates or provide inspiration for future migrations. + +## Warning + +- Please keep in mind, when adding these files to the migrations folder, it's important to rename them according to the conventions established by the migration service +- As the data model or the data location may undergo changes over time, it's imporant to have a clear understanding of the implications when using these files. + +## Template files + +- `pseudonimyze-data.sparql-template` - the file that contains the sparql for pseudonymizing data in the triplestore. It should run every time the db is "refreshed" with a copy from PROD. diff --git a/config/migrations-sample/pseudonimyze-data.sparql-template b/config/migrations-sample/pseudonimyze-data.sparql-template new file mode 100644 index 0000000..c3d49da --- /dev/null +++ b/config/migrations-sample/pseudonimyze-data.sparql-template @@ -0,0 +1,149 @@ +PREFIX rdf: +PREFIX rdfs: +PREFIX person: +PREFIX persoon: +PREFIX foaf: +PREFIX schema: +PREFIX mandaat: +PREFIX locn: +PREFIX adres: +PREFIX xsd: +PREFIX generiek: + +DELETE { + GRAPH ?g { + ?person foaf:familyName ?fn. + ?person foaf:givenName ?gn. + ?person persoon:gebruikteVoornaam ?gvn. + } +} INSERT { + GRAPH ?g { + ?person foaf:givenName ?gn_s. + ?person foaf:familyName ?fn_s. + ?person persoon:gebruikteVoornaam ?gvn_s. + } +} WHERE { + VALUES ?g { } + GRAPH ?g { + BIND("njbyevfeRTE8651B" AS ?salt). + ?person a person:Person. + OPTIONAL { + ?person foaf:givenName ?gn. + BIND(SHA1(CONCAT(?salt, ?gn)) AS ?gn_s). + } + OPTIONAL { + ?person foaf:familyName ?fn. + BIND(SHA1(CONCAT(?salt, ?fn)) AS ?fn_s). + } + OPTIONAL { + ?person persoon:gebruikteVoornaam ?gvn. + BIND(SHA1(CONCAT(?salt, ?gvn)) AS ?gvn_s). + } + } +} + +; + +DELETE { + GRAPH ?h { + ?birth persoon:datum ?dob. + ?identificator generiek:lokaleIdentificator ?rrn . + ?person persoon:heeftNationaliteit ?nationality . + ?person persoon:geslacht ?gender . + } +} INSERT { + GRAPH ?h { + ?birth persoon:datum "1977-01-01T00:00:00Z"^^xsd:dateTime . + ?identificator generiek:lokaleIdentificator "42012205181" . + } +} WHERE { + VALUES ?g { } + VALUES ?h { } + GRAPH ?g { + ?person a person:Person. + } + GRAPH ?h { + OPTIONAL { + ?person persoon:heeftGeboorte ?birth . + ?birth persoon:datum ?dob. + } + OPTIONAL { + ?person persoon:registratie/generiek:gestructureerdeIdentificator ?identificator . + ?identificator generiek:lokaleIdentificator ?rrn . + } + OPTIONAL { + ?person persoon:geslacht ?gender . + } + OPTIONAL { + ?person persoon:heeftNationaliteit ?nationality . + } + } +} + +; + +DELETE { + GRAPH ?g { + ?cp schema:telephone ?phone. + ?cp schema:email ?mail. + ?address locn:fullAddress ?fa. + ?address adres:Adresvoorstelling.huisnummer ?huisnr. + ?address adres:Adresvoorstelling.busnummer ?busnr. + ?address locn:thoroughfare ?street. + ?address locn:postCode ?postCode. + ?address adres:gemeentenaam ?gemeente. + } +} INSERT { + GRAPH ?g { + ?cp schema:telephone ?phone_s. + ?cp schema:email ?mail_s. + ?address locn:fullAddress ?fa_s. + ?address adres:Adresvoorstelling.huisnummer ?huisnr_s. + ?address adres:Adresvoorstelling.busnummer ?busnr_s. + ?address locn:thoroughfare ?street_s. + ?address locn:postCode ?postCode_s. + ?address adres:gemeentenaam ?gemeente_s. + } +} WHERE { + VALUES ?g { } + GRAPH ?g { + BIND("njbyevfeRTE8651B" AS ?salt). + ?cp a . + + OPTIONAL { + ?cp schema:telephone ?phone. + BIND(SHA1(CONCAT(?salt, ?phone)) AS ?phone_s). + } + OPTIONAL { + ?cp schema:email ?mail. + BIND(CONCAT(SHA1(CONCAT(?salt, ?mail)), "@email.com") AS ?mail_s). + } + OPTIONAL { + ?cp locn:address ?address. + OPTIONAL { + ?address locn:fullAddress ?fa. + BIND(SHA1(CONCAT(?salt, ?fa)) AS ?fa_s). + } + OPTIONAL { + ?address adres:Adresvoorstelling.huisnummer ?huisnr. + BIND(SHA1(CONCAT(?salt, ?huisnr)) AS ?huisnr_s). + } + OPTIONAL { + ?address adres:Adresvoorstelling.busnummer ?busnr. + BIND(SHA1(CONCAT(?salt, ?busnr)) AS ?busnr_s). + } + OPTIONAL { + ?address locn:thoroughfare ?street. + BIND(SHA1(CONCAT(?salt, ?street)) AS ?street_s). + } + OPTIONAL { + ?address locn:postCode ?postCode. + BIND(SHA1(CONCAT(?salt, ?postCode)) AS ?postCode_s). + } + OPTIONAL { + ?address adres:gemeentenaam ?gemeente. + BIND(SHA1(CONCAT(?salt, ?gemeente)) AS ?gemeente_s). + } + } + } +} \ No newline at end of file diff --git a/config/migrations/local/.gitkeep b/config/migrations/local/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/config/migrations/local/README.md b/config/migrations/local/README.md new file mode 100644 index 0000000..518aaf9 --- /dev/null +++ b/config/migrations/local/README.md @@ -0,0 +1,3 @@ +# Motivation + +This folder is designed to contain migration files specific to a specific deployed instance of the app. These files will be ignored by git. The typical use case for this folder includes migrations containing sensitive data or those related to a re-sync of consumers. Migrations that should be applied to all instances of the app should be stored outside of this folder, but within the 'migrations' folder. From 60ba1df934c6eaca1b20c8019f77e7ddde39b89a Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Tue, 27 Feb 2024 15:22:30 +0100 Subject: [PATCH 15/48] chore: gitignore migrations/local --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4b8e33a..894c430 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ docker-compose.override.yml .env /config/migrations/private-data/* +/config/migrations/local/* /config/proxy/nginx.htpasswd From 4dc4bf84fa2d3e2ab836501070f3df3cf81492c7 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Wed, 28 Feb 2024 12:16:35 +0100 Subject: [PATCH 16/48] Add `remove-type-in-producer-graph.sparql-template` --- config/migrations-sample/README.md | 1 + .../remove-type-in-producer-graph.sparql-template | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 config/migrations-sample/remove-type-in-producer-graph.sparql-template diff --git a/config/migrations-sample/README.md b/config/migrations-sample/README.md index d2e79fa..e506f8b 100644 --- a/config/migrations-sample/README.md +++ b/config/migrations-sample/README.md @@ -11,3 +11,4 @@ In addition, these files can function as templates or provide inspiration for fu ## Template files - `pseudonimyze-data.sparql-template` - the file that contains the sparql for pseudonymizing data in the triplestore. It should run every time the db is "refreshed" with a copy from PROD. +- `remove-type-in-producer-graph.sparql-template` - the migration to handle the occasional sync issue between OP and Loket. diff --git a/config/migrations-sample/remove-type-in-producer-graph.sparql-template b/config/migrations-sample/remove-type-in-producer-graph.sparql-template new file mode 100644 index 0000000..3f16e82 --- /dev/null +++ b/config/migrations-sample/remove-type-in-producer-graph.sparql-template @@ -0,0 +1,9 @@ +DELETE WHERE { + GRAPH { + a ?firsttype. + a ?secondtype. + a ?thirdtype. + a ?fourthtype. + a ?fifthtype. + } +} \ No newline at end of file From 12d3ae6d108262340e07f8b5e6859d3b7ad93e35 Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 1 Mar 2024 11:57:10 +0100 Subject: [PATCH 17/48] Chore: bump frontend to new pre-release version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f2af463..e3f016a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.22.0-0 + image: lblod/frontend-organization-portal:1.22.0-1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From f518646c06d8c3fcd2bd131f91b0d144a6fe6838 Mon Sep 17 00:00:00 2001 From: Oscar Date: Fri, 1 Mar 2024 14:33:03 +0100 Subject: [PATCH 18/48] Exclude the data of CLB from the producer --- .../organizations-public-info/export.json | 59 ------------------- 1 file changed, 59 deletions(-) diff --git a/config/delta-producer/organizations-public-info/export.json b/config/delta-producer/organizations-public-info/export.json index 100be72..2d755ff 100644 --- a/config/delta-producer/organizations-public-info/export.json +++ b/config/delta-producer/organizations-public-info/export.json @@ -15,8 +15,6 @@ "http://www.w3.org/2004/02/skos/core#altLabel", "http://www.w3.org/ns/adms#identifier", "http://www.w3.org/ns/regorg#orgStatus", - "http://www.w3.org/ns/org#hasPrimarySite", - "http://www.w3.org/ns/org#hasSite", "http://www.w3.org/ns/org#changedBy", "http://www.w3.org/ns/org#resultedFrom", "http://www.w3.org/ns/org#hasPost", @@ -42,8 +40,6 @@ "http://www.w3.org/2004/02/skos/core#altLabel", "http://www.w3.org/ns/adms#identifier", "http://www.w3.org/ns/regorg#orgStatus", - "http://www.w3.org/ns/org#hasPrimarySite", - "http://www.w3.org/ns/org#hasSite", "http://www.w3.org/ns/org#changedBy", "http://www.w3.org/ns/org#resultedFrom", "http://www.w3.org/ns/org#hasPost", @@ -77,8 +73,6 @@ "http://www.w3.org/ns/org#changedBy", "http://www.w3.org/ns/org#classification", "http://www.w3.org/ns/org#hasPost", - "http://www.w3.org/ns/org#hasPrimarySite", - "http://www.w3.org/ns/org#hasSite", "http://www.w3.org/ns/org#hasSubOrganization", "http://www.w3.org/ns/org#linkedTo", "http://www.w3.org/ns/org#resultedFrom", @@ -126,59 +120,6 @@ "http://data.lblod.info/vocabularies/erediensten/functie" ] }, - { - "type": "http://www.w3.org/ns/org#Site", - "graphsFilter": [ - "http://mu.semte.ch/graphs/shared", - "http://mu.semte.ch/graphs/worship-service", - "http://mu.semte.ch/graphs/administrative-unit" - ], - "properties": [ - "http://mu.semte.ch/vocabularies/core/uuid", - "http://www.w3.org/ns/org#siteAddress", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://data.lblod.info/vocabularies/erediensten/vestigingstype" - ] - }, - { - "type": "http://www.w3.org/ns/locn#Address", - "graphsFilter": [ - "http://mu.semte.ch/graphs/shared", - "http://mu.semte.ch/graphs/worship-service", - "http://mu.semte.ch/graphs/administrative-unit" - ], - "properties": [ - "http://mu.semte.ch/vocabularies/core/uuid", - "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer", - "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.busnummer", - "http://www.w3.org/ns/locn#thoroughfare", - "http://www.w3.org/ns/locn#postCode", - "https://data.vlaanderen.be/ns/adres#gemeentenaam", - "http://www.w3.org/ns/locn#adminUnitL2", - "https://data.vlaanderen.be/ns/adres#land", - "http://www.w3.org/ns/locn#fullAddress", - "https://data.vlaanderen.be/ns/adres#verwijstNaar", - "http://purl.org/dc/terms/source" - ] - }, - { - "type": "http://schema.org/ContactPoint", - "graphsFilter": [ - "http://mu.semte.ch/graphs/shared", - "http://mu.semte.ch/graphs/worship-service", - "http://mu.semte.ch/graphs/administrative-unit" - ], - "properties": [ - "http://mu.semte.ch/vocabularies/core/uuid", - "http://www.w3.org/ns/locn#address", - "http://xmlns.com/foaf/0.1/page", - "http://schema.org/faxNumber", - "http://schema.org/contactType", - "http://xmlns.com/foaf/0.1/page", - "http://schema.org/email", - "http://schema.org/telephone" - ] - }, { "type": "http://www.w3.org/ns/adms#Identifier", "graphsFilter": [ From 607844ae3340da41dd8d97b776f8a36b271e124c Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 26 Feb 2024 11:21:08 +0100 Subject: [PATCH 19/48] feat: added attribute for legal name to organisations --- config/resources/domain.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/resources/domain.json b/config/resources/domain.json index a454026..3e8db7e 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -377,6 +377,10 @@ "type": "string", "predicate": "skos:altLabel" }, + "legal-name": { + "type": "string", + "predicate": "regorg:legalName" + }, "expected-end-date": { "type": "date", "predicate": "lblodgeneriek:geplandeEindDatum" From e70c112f20f9b101be89e28a28e5e28e6d6db38e Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 26 Feb 2024 11:53:43 +0100 Subject: [PATCH 20/48] feat: Added migration to copy preferred name to new legal name property --- ...40226102340-copy-name-to-legal-name.sparql | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql diff --git a/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql new file mode 100644 index 0000000..a9901a4 --- /dev/null +++ b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql @@ -0,0 +1,25 @@ +PREFIX org: +PREFIX regorg: +PREFIX skos: + +INSERT { + GRAPH { + ?org regorg:legalName ?name . + } +} WHERE { + GRAPH { + ?org a org:Organization ; + skos:prefLabel ?name . + } +} +; +INSERT { + GRAPH { + ?org regorg:legalName ?name . + } +} WHERE { + GRAPH { + ?org a org:Organization ; + skos:prefLabel ?name . + } +} From b7279d26409e901f01b006e54e35b370346f4241 Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 27 Feb 2024 10:47:13 +0100 Subject: [PATCH 21/48] fix: also copy name to legal name for organisations in the shared graph --- .../2024/20240226102340-copy-name-to-legal-name.sparql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql index a9901a4..05a4fb7 100644 --- a/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql +++ b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql @@ -14,6 +14,16 @@ INSERT { } ; INSERT { + GRAPH { + ?org regorg:legalName ?name . + } +} WHERE { + GRAPH { + ?org a org:Organization ; + skos:prefLabel ?name . + } +} +;INSERT { GRAPH { ?org regorg:legalName ?name . } From ead102d8c6bb471891399f903963bcf1c096c427 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 28 Feb 2024 10:15:25 +0100 Subject: [PATCH 22/48] feat: Allow editor role to write to shared graph The shared graph contains, among others, the (legal) names of municipalities and provinces. So far their names were not modifiable in OP. This change allows these names to be modified in that graph by the users with the appropriate role. --- config/authorization/config.ex | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 12f824e..8742d8e 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -128,6 +128,12 @@ defmodule Acl.UserGroups.Config do constraint: %ResourceConstraint{ resource_types: @org_type ++ @error_type } + }, + %GraphSpec{ + graph: "http://mu.semte.ch/graphs/shared", + constraint: %ResourceConstraint{ + resource_types: @org_type + } } ] }, From 1289f1d78af74a39b25a1634c87a6f59afc447b5 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 28 Feb 2024 14:20:27 +0100 Subject: [PATCH 23/48] refactor: added newline --- .../2024/20240226102340-copy-name-to-legal-name.sparql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql index 05a4fb7..27c3de3 100644 --- a/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql +++ b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql @@ -23,7 +23,8 @@ INSERT { skos:prefLabel ?name . } } -;INSERT { +; +INSERT { GRAPH { ?org regorg:legalName ?name . } From 36670ebfa47e25aed760446c519ff895cb6a8559 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 28 Feb 2024 18:26:54 +0100 Subject: [PATCH 24/48] feat: index legal name for administrative units --- config/search/config.json | 10 ++++++++++ config/search/dev/config.json | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/config/search/config.json b/config/search/config.json index db8733f..48f6676 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -765,6 +765,7 @@ ], "properties": { "name": "http://www.w3.org/2004/02/skos/core#prefLabel", + "legal_name": "http://www.w3.org/ns/regorg#legalName", "classification_id": [ "http://www.w3.org/ns/org#classification", "http://mu.semte.ch/vocabularies/core/uuid" @@ -822,6 +823,15 @@ } } }, + "legal_name": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "classification_name": { "type": "text", "fields": { diff --git a/config/search/dev/config.json b/config/search/dev/config.json index c58fda3..2d1b912 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -738,6 +738,7 @@ ], "properties": { "name": "http://www.w3.org/2004/02/skos/core#prefLabel", + "legal_name": "http://www.w3.org/ns/regorg#legalName", "classification_id": [ "http://www.w3.org/ns/org#classification", "http://mu.semte.ch/vocabularies/core/uuid" @@ -795,6 +796,15 @@ } } }, + "legal_name": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "classification_name": { "type": "text", "fields": { From d10465b73f5adcfdae8032b476b68d1bb57f168d Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 29 Feb 2024 09:48:26 +0100 Subject: [PATCH 25/48] feat: allow administrator to edit data in shared graph, added error_type --- config/authorization/config.ex | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 8742d8e..c45404e 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -132,7 +132,7 @@ defmodule Acl.UserGroups.Config do %GraphSpec{ graph: "http://mu.semte.ch/graphs/shared", constraint: %ResourceConstraint{ - resource_types: @org_type + resource_types: @org_type ++ @error_type } } ] @@ -147,6 +147,12 @@ defmodule Acl.UserGroups.Config do constraint: %ResourceConstraint{ resource_types: @org_type ++ @error_type } + }, + %GraphSpec{ + graph: "http://mu.semte.ch/graphs/shared", + constraint: %ResourceConstraint{ + resource_types: @org_type ++ @error_type + } } ] }, From 3cc305982a19e152b211562b5b53452e9af4e375 Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 29 Feb 2024 13:15:01 +0100 Subject: [PATCH 26/48] fix: removed write access to shared graph This access was required to edit the (legal) name of municipalities and provinces. This did lead to an issue were data for administrative units was incorrectly written to both graphs. To avoid this we decided that, at least for the moment, the name of municipalities and provinces is not editable, removing the need to be able to write to the shared graph. --- config/authorization/config.ex | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/config/authorization/config.ex b/config/authorization/config.ex index c45404e..12f824e 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -128,12 +128,6 @@ defmodule Acl.UserGroups.Config do constraint: %ResourceConstraint{ resource_types: @org_type ++ @error_type } - }, - %GraphSpec{ - graph: "http://mu.semte.ch/graphs/shared", - constraint: %ResourceConstraint{ - resource_types: @org_type ++ @error_type - } } ] }, @@ -147,12 +141,6 @@ defmodule Acl.UserGroups.Config do constraint: %ResourceConstraint{ resource_types: @org_type ++ @error_type } - }, - %GraphSpec{ - graph: "http://mu.semte.ch/graphs/shared", - constraint: %ResourceConstraint{ - resource_types: @org_type ++ @error_type - } } ] }, From 4e0a9170d99368e04f056d4c0805b4d92e0ac084 Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 1 Mar 2024 16:34:19 +0100 Subject: [PATCH 27/48] refactor: combined different queries in migration into one --- ...40226102340-copy-name-to-legal-name.sparql | 34 +++++-------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql index 27c3de3..3873839 100644 --- a/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql +++ b/config/migrations/2024/20240226102340-copy-name-to-legal-name.sparql @@ -3,34 +3,18 @@ PREFIX regorg: PREFIX skos: INSERT { - GRAPH { - ?org regorg:legalName ?name . + GRAPH ?g { + ?org regorg:legalName ?legalName . } } WHERE { - GRAPH { - ?org a org:Organization ; - skos:prefLabel ?name . - } -} -; -INSERT { - GRAPH { - ?org regorg:legalName ?name . - } -} WHERE { - GRAPH { - ?org a org:Organization ; - skos:prefLabel ?name . - } -} -; -INSERT { - GRAPH { - ?org regorg:legalName ?name . - } -} WHERE { - GRAPH { + GRAPH ?g { ?org a org:Organization ; skos:prefLabel ?name . } + VALUES ?g { + + + + } + BIND(?name AS ?legalName) } From b9e8d72f0109e1a3bea09614925f15cd1f2507e4 Mon Sep 17 00:00:00 2001 From: Nordine Bittich <3816305+nbittich@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:20:08 +0100 Subject: [PATCH 28/48] Update dispatcher.ex (#386) --- config/dispatcher/dispatcher.ex | 1 - 1 file changed, 1 deletion(-) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 7c1c085..814f7eb 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -249,7 +249,6 @@ defmodule Dispatcher do ############################################################### match "/search/*path", %{ accept: %{ json: true }, layer: :api_services} do - IO.puts("hey") Proxy.forward conn, path, "http://search/" end From e80d231f358f45e5f71ab0a26054b0c7de0cbe28 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 13 Mar 2024 18:36:53 +0100 Subject: [PATCH 29/48] fixed taking out Z in reasoner for date time conversion --- config/reasoner/dl2op/main-info/mapping.n3 | 14 ++++++++------ config/reasoner/dl2op/main/mapping.n3 | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 36c4585..6166723 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -145,16 +145,18 @@ PREFIX ere: # "2022-11-30T23:00:00Z"^^xsd:dateTime # So, the following rule adds 2 hours to the datetime, and then takes the date part of the UTC date time # to come to the date that the DL user selected (in CE(S)T) +# To make sure the date have the same convention we now save them as datetime without the timezone indicator { - ?dateTime :dateFromDateTime ?date -} <= { - ?date string:notMatches """^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).*""" . - (?date "T00:00:00") string:concatenation ?datePlusTime. - (?datePlusTime xsd:dateTime) log:dtlit ?dateTime + ?date :dateTimeFromDate ?dateTime +} +<= +{ + ( ?date 1 10 ) string:substring ?dateSolo . + (?dateSolo "T00:00:00") string:concatenation ?datePlusTime. + (?datePlusTime xsd:dateTime) log:dtlit ?dateTime . }. - # ex:orgA besluit:classificatie . { { diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 310f9c1..9d57423 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -131,13 +131,15 @@ PREFIX lblodlg: # and 1 December # "2022-11-30T23:00:00Z"^^xsd:dateTime # So, the following rule adds 2 hours to the datetime, and then takes the date part of the UTC date time -# to come to the date that the DL user selected (in CE(S)T) +# To make sure the date have the same convention we now save them as datetime without the timezone indicator { - ?dateTime :dateTimeFromDate ?date -} <= { - ?date string:notMatches """^(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2}).*""" . - (?date "T00:00:00") string:concatenation ?datePlusTime. - (?datePlusTime xsd:dateTime) log:dtlit ?dateTime + ?date :dateTimeFromDate ?dateTime +} +<= +{ + ( ?date 1 10 ) string:substring ?dateSolo . + (?dateSolo "T00:00:00") string:concatenation ?datePlusTime. + (?datePlusTime xsd:dateTime) log:dtlit ?dateTime . }. # ex:orgA besluit:classificatie . From 6513bfcfd5e23ae83a9c3e34e3b0ac487dfdaa08 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 6 Mar 2024 11:14:59 +0100 Subject: [PATCH 30/48] feat: allow organisations to have multiple alternative names --- config/resources/domain.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/resources/domain.json b/config/resources/domain.json index 3e8db7e..1bc4628 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -374,7 +374,7 @@ "predicate": "skos:prefLabel" }, "alternative-name": { - "type": "string", + "type": "string-set", "predicate": "skos:altLabel" }, "legal-name": { From 84d59bb17389110dba6c96423dce1758e785ba0b Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 7 Mar 2024 19:34:42 +0100 Subject: [PATCH 31/48] feat: include alternative name in search index --- config/search/config.json | 10 ++++++++++ config/search/dev/config.json | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/config/search/config.json b/config/search/config.json index 48f6676..afecb61 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -766,6 +766,7 @@ "properties": { "name": "http://www.w3.org/2004/02/skos/core#prefLabel", "legal_name": "http://www.w3.org/ns/regorg#legalName", + "alternative_name": "http://www.w3.org/2004/02/skos/core#altLabel", "classification_id": [ "http://www.w3.org/ns/org#classification", "http://mu.semte.ch/vocabularies/core/uuid" @@ -832,6 +833,15 @@ } } }, + "alternative_name": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "classification_name": { "type": "text", "fields": { diff --git a/config/search/dev/config.json b/config/search/dev/config.json index 2d1b912..53a4f19 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -739,6 +739,7 @@ "properties": { "name": "http://www.w3.org/2004/02/skos/core#prefLabel", "legal_name": "http://www.w3.org/ns/regorg#legalName", + "alternative_name": "http://www.w3.org/2004/02/skos/core#altLabel", "classification_id": [ "http://www.w3.org/ns/org#classification", "http://mu.semte.ch/vocabularies/core/uuid" @@ -805,6 +806,15 @@ } } }, + "alternative_name": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "classification_name": { "type": "text", "fields": { From 7bdc6519a99a25bf83470c5c09828cf63085e2da Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 11 Mar 2024 16:48:13 +0100 Subject: [PATCH 32/48] feat: import juridical and alternative names for PZ and HVZ --- ...0-delete-existing-alternative-names.sparql | 17 + ...-import-politiezone-juridical-names.sparql | 1953 +++++++++++++++++ ...mport-politiezone-alternative-names.sparql | 583 +++++ ...11161910-import-hvz-juridical-names.sparql | 303 +++ ...161911-import-hvz-alternative-names.sparql | 203 ++ 5 files changed, 3059 insertions(+) create mode 100644 config/migrations/2024/20240311134000-import-pz-hvz-names/20240311151100-delete-existing-alternative-names.sparql create mode 100644 config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161908-import-politiezone-juridical-names.sparql create mode 100644 config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161909-import-politiezone-alternative-names.sparql create mode 100644 config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161910-import-hvz-juridical-names.sparql create mode 100644 config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161911-import-hvz-alternative-names.sparql diff --git a/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311151100-delete-existing-alternative-names.sparql b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311151100-delete-existing-alternative-names.sparql new file mode 100644 index 0000000..27b6d48 --- /dev/null +++ b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311151100-delete-existing-alternative-names.sparql @@ -0,0 +1,17 @@ +PREFIX org: +PREFIX skos: + +DELETE { + GRAPH { + ?s skos:altLabel ?name . + } +} WHERE { + GRAPH { + ?s org:classification ?class ; + skos:altLabel ?name . + } + VALUES ?class { + # HVZ + # PZ + } +} diff --git a/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161908-import-politiezone-juridical-names.sparql b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161908-import-politiezone-juridical-names.sparql new file mode 100644 index 0000000..9d0cd68 --- /dev/null +++ b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161908-import-politiezone-juridical-names.sparql @@ -0,0 +1,1953 @@ +PREFIX core: +PREFIX regorg: +PREFIX skos: + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5408 PZ Asse/Merchtem/Opwijk/Wemmel" . + } +} WHERE { + GRAPH { + ?s core:uuid "90688b32e0808b6ebbb7b36030526750236527e8019414449065f57ea384ce71" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5462 PZ Ieper/Wervik/Heuvelland/Mesen/Poperinge/Vleteren/Langemark-Poelkapelle/Moorslede/Staden/Zonnebeke" . + } +} WHERE { + GRAPH { + ?s core:uuid "195d911f1417b20a4b715b1a54e8ae6e92b9a23cde908f2fb03a0081910d8fce" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5440 PZ Aalst" . + } +} WHERE { + GRAPH { + ?s core:uuid "e5f3c3f23f6791de122a5e6f1af83543651d272eba40e138c2fdf91ec05f8a40" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5423 PZ Aalter/Knesselare" . + } +} WHERE { + GRAPH { + ?s core:uuid "e06ce64825e386178b350aa6b2fa869c70ad39aa99ddb3ca2a73d6b103e91161" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5394 PZ Aarschot" . + } +} WHERE { + GRAPH { + ?s core:uuid "254bbfb6c31a668446c339c0996864d23c3fe129a5aa05e274b463cbbb4a4bc2" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5345 PZ Antwerpen" . + } +} WHERE { + GRAPH { + ?s core:uuid "097191c539cc02e6044671221f3ea0a8428c7fbc8dbdd5f38ee8f02ca51c6082" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5421 PZ Assenede/Evergem" . + } +} WHERE { + GRAPH { + ?s core:uuid "96d87c4956c98414938dd5fceeb05f65feebf21fbe5918e6d23bc2b58a7fc716" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5359 PZ Bonheiden/Duffel/Putte/Sint-Katelijne-Waver" . + } +} WHERE { + GRAPH { + ?s core:uuid "f4838c2bb548a35f92a6ddcf725676b9f137f3fcb11e6737caa7cab1f1314e27" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5399 PZ Begijnendijk/Rotselaar/Tremelo" . + } +} WHERE { + GRAPH { + ?s core:uuid "81083789b63917e32ab90ef1a45adf893f370ee38da2e0542e5c035db4f60794" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5368 PZ Balen/Dessel/Mol" . + } +} WHERE { + GRAPH { + ?s core:uuid "d847f2f345c5e58882e0e468c31de8868e71a73f4cbfa63823de17da3c7f1942" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5404 PZ Beersel" . + } +} WHERE { + GRAPH { + ?s core:uuid "cbb5b8b80d03be75744a41580e5658b3c236fa0a12822bbb334f893c524b5b18" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5373 PZ Beringen/Ham/Tessenderlo" . + } +} WHERE { + GRAPH { + ?s core:uuid "08b6bdc2c34dacae28168cf967ef2e13384f032a147ddaea7f1145eff4f0d161" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5361 PZ Berlaar/Nijlen" . + } +} WHERE { + GRAPH { + ?s core:uuid "f5094b8d7f26d69d04ba2c469a09e0c6dc08a78615c9483fd97d6d029e064121" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5436 PZ Berlare/Zele" . + } +} WHERE { + GRAPH { + ?s core:uuid "414f3538e482d3c1c21382ca22de18998ca1d3f5b517ced85946ecf90143149c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5397 PZ Bertem/ Huldenberg/Oud-Heverlee" . + } +} WHERE { + GRAPH { + ?s core:uuid "3efcad40be18e793d070f78a44f2e63bc105778d6c8c4edc4bfeb5a87f06554c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5430 PZ Beveren" . + } +} WHERE { + GRAPH { + ?s core:uuid "488938bd557800723290a816c51b471fff7f4918237a509f697973af6f509390" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5391 PZ Bierbeek/Boutersem/Holsbeek/Lubbeek" . + } +} WHERE { + GRAPH { + ?s core:uuid "da737a74e5094054c3bb3ef077839626a02eb79d148e15cfeee18e10c18ba55a" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5381 PZ Bilzen/Hoeselt/Riemst" . + } +} WHERE { + GRAPH { + ?s core:uuid "19ac0fa207989c27c3391e327aee16435475292296f010867945bf2987f95477" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5445 PZ Blankenberge/Zuienkerke" . + } +} WHERE { + GRAPH { + ?s core:uuid "05354d6fcc016d06f988a0e044fb160be7573550c11fe414b3c011961150a686" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5385 PZ Bocholt/Bree/Kinrooi/Meeuwen-Gruitrode" . + } +} WHERE { + GRAPH { + ?s core:uuid "9893dc25d4b91aef9e2ef6f712e0aac68cdf6f144dbed887c9500e6360df080d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5395 PZ Boortmeerbeek/Haacht/Keerbergen" . + } +} WHERE { + GRAPH { + ?s core:uuid "d5d6693850ba1a749739c4574e7c75a98820629fdbbbbb143b7a4f7c279247ea" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5356 PZ Bornem/Puurs/Sint-Amands" . + } +} WHERE { + GRAPH { + ?s core:uuid "3b2c2151632d84c55dd93372a4e91a7493455a7f77a90fa2066fc618411d0ed6" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5426 PZ Brakel/Horebeke/Maarkedal/Zwalm" . + } +} WHERE { + GRAPH { + ?s core:uuid "b7af3483cb5d0021c6f5864a433b211fce30246ef685621d104b1951915c21c4" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5352 PZ Brasschaat" . + } +} WHERE { + GRAPH { + ?s core:uuid "dce9ffab7edf87d670ce7ec399084fc2e12c6b5bb300b865e87c5237beae4ae0" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5450 PZ Bredene/DeHaan" . + } +} WHERE { + GRAPH { + ?s core:uuid "c7d15b793e42f0024e56ae7a89d02f8d6f491ec42cd2ece4c856ee24b154559d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5444 PZ Brugge" . + } +} WHERE { + GRAPH { + ?s core:uuid "eed6ef4fd7723fca33613bb9c9570825be3f8e50c32ce9456ded3d54bc624370" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5437 PZ Buggenhout/Lebbeke" . + } +} WHERE { + GRAPH { + ?s core:uuid "7e526f7f2d12f55a06620b512401826b6855ed478ff0693e04fba59cabba3c4d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5909 PZ Genk/Zutendaal/As/Oudsbergen/Houthalen-Helchteren/Bocholt/Bree/Kinrooi" . + } +} WHERE { + GRAPH { + ?s core:uuid "e7692f99-9a36-43e3-af78-b320390318dc" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5446 PZ Damme/Knokke-Heist" . + } +} WHERE { + GRAPH { + ?s core:uuid "165a9a64a6b84a278806b11c3f760f48198990168f591cf7a7462beb0f2cb16b" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5420 PZ Deinze/Zulte" . + } +} WHERE { + GRAPH { + ?s core:uuid "19c1183ad20b9b4023da2eb7d1ab3eb5dda64558e050c8198abf9714463362ff" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5911 PZ Deinze/Zulte/Lievegem" . + } +} WHERE { + GRAPH { + ?s core:uuid "dad37923-85b4-4c30-8bd6-050061bde51c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5396 PZ Diest/Scherpenheuvel-Zichem" . + } +} WHERE { + GRAPH { + ?s core:uuid "41e3bb71cb1fe2763a64ce47ee758fbeb532fbd4348281f34a86a5f88dd71980" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5439 PZ Denderleeuw/Haaltert" . + } +} WHERE { + GRAPH { + ?s core:uuid "c5726151c11e3ec6dd94a158ead5e9bd9e4a7307ab76e4f64da20fc526d481aa" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5443 PZ Dendermonde" . + } +} WHERE { + GRAPH { + ?s core:uuid "67b25dc29ad301f607aed564241d318de74be7dc1ec15202a67111d7a86becf9" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5370 PZ Diepenbeek/Hasselt/Zonhoven" . + } +} WHERE { + GRAPH { + ?s core:uuid "9e2072f69e9c1ecd1af7f65a234f141ef6cfe36eb63b2758d54d1414618188ff" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5406 PZ Dilbeek" . + } +} WHERE { + GRAPH { + ?s core:uuid "e65a70ecf702fb23f1447e234eab584fe788e9618fb7d52cd1d562718207b499" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5402 PZ Hoeilaart/Overijse" . + } +} WHERE { + GRAPH { + ?s core:uuid "b5aee7f43fc9c5d0df74e2cbb9214c03c425cf026b1fd77dd1e3b08e5fc7f875" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5441 PZ Erpe-Mere/Lede" . + } +} WHERE { + GRAPH { + ?s core:uuid "622fa725ba8455b01817c8e48974edeab56607018fce5c1cb3694306d3e7005c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5458 PZ Deerlijk/Harelbeke" . + } +} WHERE { + GRAPH { + ?s core:uuid "479036ca47b011e16fefafbe4d3512a44c564804dc26d331ce4dcbe0fa3366d2" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5366 PZ Geel/Laakdal/Meerhout" . + } +} WHERE { + GRAPH { + ?s core:uuid "7271a57b8249b4dd3175f50ea96c66ff536eff057c6bc0acfe40281e2a91ddc2" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5384 PZ As/Opglabbeek/Genk/Zutendaal" . + } +} WHERE { + GRAPH { + ?s core:uuid "d39a7017044dcf082194095e3b3ec72de112bd47528e32125c697be1aa3c10cd" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5415 PZ Gent" . + } +} WHERE { + GRAPH { + ?s core:uuid "5187962dfd40789953d4fbde3634751ee90b48b17147c585ccf4f2ac1ee72fd3" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5428 PZ Geraardsbergen/Lierde" . + } +} WHERE { + GRAPH { + ?s core:uuid "25572d6c63bc386d742bbb6ac0d8ddc739dc0599e156c6eac68aca492390840e" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5910 PZ Landen/Linter/Zoutleeuw/Hoegaarden/Tienen" . + } +} WHERE { + GRAPH { + ?s core:uuid "81334af3-1b6f-4308-aca3-107121462d56" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5350 PZ Essen/Kalmthout/Wuustwezel" . + } +} WHERE { + GRAPH { + ?s core:uuid "4ffd00c0ba7ceab20db24832a4b9963112ed66914dcca05f3e5dc8b8b9d4479d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5455 PZ Menen/Ledegem/Wevelgem" . + } +} WHERE { + GRAPH { + ?s core:uuid "e39d8bf95a03ade08ef25a79ebc050abfc81a69731f1de66fe6d031d27135aac" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5410 PZ Grimbergen" . + } +} WHERE { + GRAPH { + ?s core:uuid "5018524f9ceca4f9e21764f9e8e4e63d1ad6890c338c090d0dd074faccf1bfb2" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5372 PZ Hamont-Achel/Pelt" . + } +} WHERE { + GRAPH { + ?s core:uuid "77801115dec7f63400134c21d897a41bddb775eb438d81b354ad18fb6d7ab956" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5349 PZ Aartselaar/Edegem/Hove/Kontich/Lint" . + } +} WHERE { + GRAPH { + ?s core:uuid "bb9a9db9c00189c27a851f0b772772675cba77e2463ab734477d00e4294db5df" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5389 PZ Bekkevoort/Geetbets/Glabbeek/Kortenaken/Tielt-Winge" . + } +} WHERE { + GRAPH { + ?s core:uuid "39e0e2e69be463a4628f87bffe7dc6206aa6daa4a5516fb4ce11907f57d77079" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5374 PZ Halen/Herk-de-Stad/Lummen" . + } +} WHERE { + GRAPH { + ?s core:uuid "abca98258a8436dd7f74c633f0b60c7e50b407a1bb27777c102a1963f8843f8b" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5413 PZ Halle" . + } +} WHERE { + GRAPH { + ?s core:uuid "458df2d318d52e34278e4ce1886b9458351d3a4b06fe28c68a7558b0cdd528c3" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5435 PZ Hamme/Waasmunster" . + } +} WHERE { + GRAPH { + ?s core:uuid "31bceaaaa3f4019e85edfe0e509340aa30554d0f3bb343616841c20641788b6e" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5362 PZ Heist-op-den-Berg" . + } +} WHERE { + GRAPH { + ?s core:uuid "52bda330e11552b586106748bf652e5dd41163670d5c4226b2c02bfa2f579946" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5393 PZ Herent/Kortenberg" . + } +} WHERE { + GRAPH { + ?s core:uuid "b6fb86dcca01c89d6787801c958d6b8551f3755ec6f1c35bb97c0cf37b9ddc2c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5447 PZ Beernem/Oostkamp/Zedelgem" . + } +} WHERE { + GRAPH { + ?s core:uuid "2ca642d589b8012fe65bf54df3a87f740acac78624a902ad378dc4ee6c50a848" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5375 PZ Heusden-Zolder" . + } +} WHERE { + GRAPH { + ?s core:uuid "8a72024e99b1e083aca28a026122ad2bc517372bc18e95210fb54f080136e3f8" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5392 PZ Hoegaarden/Tienen" . + } +} WHERE { + GRAPH { + ?s core:uuid "a65afe7380499a2c24c2d039f2a97493f2f99bc03836de9bb99c2c267676388f" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5378 PZ Houthalen-Helchteren" . + } +} WHERE { + GRAPH { + ?s core:uuid "08293a0d743c13f37e99deddf000e75ba13f70ca6a5ac65cde49ad23d600ab3c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5409 PZ Kapelle-op-den-Bos/Londerzeel/Meise" . + } +} WHERE { + GRAPH { + ?s core:uuid "c7778ecc532ee037ab821de348f7c6d98ed5b2401abce2e7da64687290c08962" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5412 PZ Kampenhout/Steenokkerzeel/Zemst" . + } +} WHERE { + GRAPH { + ?s core:uuid "7ddda00fc45a0994092bc26f30d97352b7586676438d5557b3f5cc336daab063" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5379 PZ Alken/Borgloon/Heers/Kortessem/Wellen" . + } +} WHERE { + GRAPH { + ?s core:uuid "150440a8bb763d6f53d24ca1c6f1460cb5817c8a261fd90e74aadac3292c3efe" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5367 PZ Arendonk/Ravels/Retie" . + } +} WHERE { + GRAPH { + ?s core:uuid "306340a51c1504e59f1c3b85c1ba1b62de8c70cb94d3998f27819761bcee5a98" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5377 PZ Hechtel-Eksel/Leopoldsburg/Peer" . + } +} WHERE { + GRAPH { + ?s core:uuid "ee07affaf869f10517967da1ba7e79151646a1f3621b3cbca591cec2b8c549b7" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5452 PZ Gistel/Ichtegem/Jabbeke/Oudenburg/Torhout" . + } +} WHERE { + GRAPH { + ?s core:uuid "a32dc005ecbc001abd3338cdacb111895d3053b313654136ef1903035c10a53c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5433 PZ Kruibeke/Temse" . + } +} WHERE { + GRAPH { + ?s core:uuid "7dd1250996188607bb1e28df1ebea0b943e8db59c08ea01e3c57672531c43ec6" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5853 PZ Lanaken-Maasmechelen" . + } +} WHERE { + GRAPH { + ?s core:uuid "1db0e6fb09e60db1e8534b20c69abb03584870612717a454937717be9b7fd019" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5386 PZ Lanaken" . + } +} WHERE { + GRAPH { + ?s core:uuid "9b1af8b3306f7f2966d2326a7a301c149d2a62db4803335aaffae9ff45fe068d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5390 PZ Landen/Linter/Zoutleeuw" . + } +} WHERE { + GRAPH { + ?s core:uuid "520ae455030cb427fa5dead38ba62d2975fcf2d0f695d365cf9e84b5b5b5b73e" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5388 PZ Leuven" . + } +} WHERE { + GRAPH { + ?s core:uuid "35454115a5e3a31059e0c4fd55906df42c75885b0233c1f17eb4bcef6e696908" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5360 PZ Lier" . + } +} WHERE { + GRAPH { + ?s core:uuid "b77b75f239b9a14e40750981aa88976e46df7ddf83c3554103409a4a2291fea3" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5907 PZ Diepenbeek/Hasselt/Zonhoven/Halen/Herk-de Stad/Lummen" . + } +} WHERE { + GRAPH { + ?s core:uuid "ff7d80dc-ec00-43ac-ac7e-d51694df37ff" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5434 PZ Lokeren" . + } +} WHERE { + GRAPH { + ?s core:uuid "d8cb6ca314f27d657f4043f27110632e63a9520070728922d3c958f51d70c281" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5371 PZ Lommel" . + } +} WHERE { + GRAPH { + ?s core:uuid "0b1af0370213e4b8ea5c3d5a2ccadcfce1149d092da47a3e447fe383050f9506" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5422 PZ Lovendegem/Nevele/Waarschoot/Zomergem" . + } +} WHERE { + GRAPH { + ?s core:uuid "2ba0f1e28168459a963a81784a8404e94268f70b49f99342d50ff421ab8a06c6" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5454 PZ Dentergem/Ingelmunster/Meulebeke/Oostrozebeke/Wielsbeke" . + } +} WHERE { + GRAPH { + ?s core:uuid "fa52110c7c3e70feab724980e2d991a97712a1deeeb25b168ef6de7b16de41ae" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5351 PZ Boechout/Borsbeek/Mortsel/Wijnegem/Wommelgem" . + } +} WHERE { + GRAPH { + ?s core:uuid "80a9ab8eb46716ab23c597d13313ce24b17884ffcbdf00d216b877d57a52ade4" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5457 PZ Waregem/ Anzegem/ Spiere-Helkijn/Zw evegem/Avelgem" . + } +} WHERE { + GRAPH { + ?s core:uuid "7b6bbae823b20191525038cd52089d22128163fb3c7f851ce56149938628d941" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5383 PZ Dilsen-Stokkem/Maaseik" . + } +} WHERE { + GRAPH { + ?s core:uuid "97028faf77fd95eb5016a13c19f3a3a8ccf97c6c937398ba96976e52d171dbd8" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5387 PZ Maasmechelen" . + } +} WHERE { + GRAPH { + ?s core:uuid "d71ddb7a663a892d7a8cb511d30bf5ae3ba49fda39dd65e39dae9c789bb901fe" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5424 PZ Maldegem" . + } +} WHERE { + GRAPH { + ?s core:uuid "3b7a6d691943806c23f59d22482dea27e451bd440f91f884aeb42e8c72016ee3" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5358 PZ Mechelen" . + } +} WHERE { + GRAPH { + ?s core:uuid "1915208b0a66992ee2014df894f7a9c538fe727a975fd9538d9e2c949e1a8471" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5906 PZ Mechelen/Willebroek" . + } +} WHERE { + GRAPH { + ?s core:uuid "73777b2512fc25f16554612a13b0de2265a56540a5ea6665bf69a8b5a805569a" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5417 PZ Eeklo/Kaprijke/Sint-Laureins" . + } +} WHERE { + GRAPH { + ?s core:uuid "d8d1b52a9170168ad481f2495652e1b9753aea23385f79710abd86549f1373fa" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5451 PZ Middelkerke" . + } +} WHERE { + GRAPH { + ?s core:uuid "04e7a09c988feed3cf8df1c51aafe0f0a50811e325f5f5ab8e1b9750f48630fd" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5888 PZ Genk/Zutendaal/As/Opglabbeek/Houthalen-Helchteren" . + } +} WHERE { + GRAPH { + ?s core:uuid "3efb7cb7fad9f61917093d42513c8a7153120906e9701b08e3560c8f109e64c1" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5369 PZ Grobbendonk/Herentals/Herenthout/Olen/Vorselaar" . + } +} WHERE { + GRAPH { + ?s core:uuid "97a393c64a3c30e619bc115ab8b2bbe0bd7a83265ebb8960c0f1154b9628d340" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5442 PZ Ninove" . + } +} WHERE { + GRAPH { + ?s core:uuid "7b1c9132de06d5b3626e7118dc16c7f129d7c911b3298a0f4609725372e64588" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5348 PZ Kapellen/Stabroek" . + } +} WHERE { + GRAPH { + ?s core:uuid "0594a740b99274c7347f3492ae4d05f9b05d057a1cbad30683634296e189cc38" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5363 PZ Hoogstraten/Merkplas/Rijkevorsel" . + } +} WHERE { + GRAPH { + ?s core:uuid "b2fdc615ffb131e53a200e14c74ac92d4ed6dac176e3e6ea2c79d227835077c9" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5449 PZ Oostende" . + } +} WHERE { + GRAPH { + ?s core:uuid "b7e07299d7acf9e78f802915227b243c31fc56eadfb575039b81fb871eec9755" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5405 PZ Bever/Galmaarden/Gooik/Herne/Lennik/Pepingen" . + } +} WHERE { + GRAPH { + ?s core:uuid "7cb2089a8c6746d514711908abfd38414a2b01f6ad9a83f28be2e835888b3da7" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5460 PZ Diksmuide/Houthulst/Koekelare/Kortemark" . + } +} WHERE { + GRAPH { + ?s core:uuid "95871bddebd4ad93db54cb1b40d41af29f7ce08f0b59698b0540be129a9a3433" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5453 PZ Hooglede/Roeselare/Izegem" . + } +} WHERE { + GRAPH { + ?s core:uuid "5ba4a42bd459dda75ce452a253ddc09547174265456ad1e3f9389a3ff139a1f9" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5416 PZ Lochristi/Moerbeke/Wachtebeke/Zelzate" . + } +} WHERE { + GRAPH { + ?s core:uuid "9cb5a65d9190da4bb96d0f59882cbcfb34248d354e6bd27101fccba186f4c7b7" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5418 PZ Destelbergen/Melle/Merelbeke/Oosterzele" . + } +} WHERE { + GRAPH { + ?s core:uuid "93389f5157ceb037c5e38d7b8119cef632528b870e91e209c033bc2eac220cc1" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5448 PZ Ardooie/Pittem/Ruiselede/Tielt/Wingene/Lichtervelde" . + } +} WHERE { + GRAPH { + ?s core:uuid "39e3e46f7cf031133152e763eaa26cab3df81f842f9912a25c69c445f0c428b8" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5364 PZ Beerse/ Lille/ Vosselaar/ Baarle-Hertog/Kasterlee /Oud-Turnhout/Turnhout" . + } +} WHERE { + GRAPH { + ?s core:uuid "a31131dd72b614c89184b331821c10a0f8feb109881a1b164749e9c8941c5e6b" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5913 PZ Bornem/Puurs-Sint-Amands/Mechelen/Willebroek" . + } +} WHERE { + GRAPH { + ?s core:uuid "81dd243d-f66c-4157-b105-5407aa83cb62" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5403 PZ Drogenbos/Linkebeek/Sint-Genesius-Rode" . + } +} WHERE { + GRAPH { + ?s core:uuid "a691d36ff95b67005d30d5fb89594dab69ec7fdbf975ffdcd36ef9bb39efb06d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5427 PZ Ronse" . + } +} WHERE { + GRAPH { + ?s core:uuid "f398f3ebafe08244f84eac783b61eac71c60bd39b8ca9ee8d9c2a4dc8638a772" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5347 PZ Boom/Rumst/Niel/Schelle/Hemiksem" . + } +} WHERE { + GRAPH { + ?s core:uuid "46616861cfaae13b550a36ae5c05187638df0873024f13043d3f40f24cabf4e6" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5419 PZ De Pinte/Gavere/Nazareth/Sint-Martens-Latem" . + } +} WHERE { + GRAPH { + ?s core:uuid "c16d166294750ae2c48acae9855a49cd3280a3597c0d8f3257021c68fdede345" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5353 PZ Schoten" . + } +} WHERE { + GRAPH { + ?s core:uuid "1298cc0fec62af4dcaa86b44d43fe7e3ee3632247e66e8fccd87c0e5c7b7742f" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5431 PZ Sint-Gillis-Waas/Stekene" . + } +} WHERE { + GRAPH { + ?s core:uuid "0cfc443c59ad06e1292b9805d967f181b989913a1ccc3e3f50a4dd8ca16bc772" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5432 PZ Sint-Niklaas" . + } +} WHERE { + GRAPH { + ?s core:uuid "5d55c0281e70d053158a06a7898bb3e1a89ed48cf111c4b6fc2a9502ebafcade" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5414 PZ Sint-Pieters-Leeuw" . + } +} WHERE { + GRAPH { + ?s core:uuid "b9fd6a7fa1ddabcaa0eb9d2eac74b41d5671623a6799a520308daabb53d5937d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5376 PZ Gingelom/Nieuwerkerken/Sint-Truiden" . + } +} WHERE { + GRAPH { + ?s core:uuid "11feae29e6178a2b58ac73bb639360d58248e3e438f2201f219b95b58c6b4ef4" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5459 PZ Alveringen/Lo-Reninge/Veurne" . + } +} WHERE { + GRAPH { + ?s core:uuid "a62fddadcb0a8fb878c3edbdc71a4eb1e6c419b212d41a8bd589fb1a370eb112" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5407 PZ Affligem/Liedekerke/Roosdaal/Ternat" . + } +} WHERE { + GRAPH { + ?s core:uuid "0610b306e95fae751dc07050565e987f31ba06420863bc44616b2e05452d8822" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5398 PZ Tervuren" . + } +} WHERE { + GRAPH { + ?s core:uuid "dea71925b69de424a8bb3c90ad5751f39c35df9e85ade437e6f6404b3ba12a42" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5380 PZ Tongeren/Herstappe" . + } +} WHERE { + GRAPH { + ?s core:uuid "41d31a2eb697af977aadf64c73e0bcffb094e0f20e4017fe3b49c507079c0976" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5456 PZ Kortrijk/Kuurne/Lendelede" . + } +} WHERE { + GRAPH { + ?s core:uuid "477e468496131b7d35f145b0361bca5c2cad577fd9ec27d385d703942dc944d0" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5411 PZ Machelen/Vilvoorde" . + } +} WHERE { + GRAPH { + ?s core:uuid "d6fe7204ffe4c6c227156eb34caddcd860f911cc98728f9593d9cd7d28d3161d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5425 PZ Kluisbergen/Kruisem/Oudenaarde/Wortegem-Petegem" . + } +} WHERE { + GRAPH { + ?s core:uuid "4deae42b2b25bff407f5abc7cbb6d62eb02afaf2892086341c324fdf2c0e6e92" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5908 PZ Bertem/Huldenberg/Oud-Heverlee/Tervuren" . + } +} WHERE { + GRAPH { + ?s core:uuid "cdcd4403-d4cd-4400-80a3-9882d79933f4" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5382 PZ Voeren" . + } +} WHERE { + GRAPH { + ?s core:uuid "92609bcab00475b084e747cb49f942abfb9e737ab023a999c69baf60acb8c06d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5355 PZ Brecht/Malle/Schilde/Zoersel" . + } +} WHERE { + GRAPH { + ?s core:uuid "5dab8a7b0656aaf0db13044fcafc0088f9f0b7776c294a6e9abfdbf7420effae" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5401 PZ Kraainem/Wezembeek-Oppem" . + } +} WHERE { + GRAPH { + ?s core:uuid "beff71011cde3ac0ee0d94b592462be141cc9f0deb5c6ea996ea191bf79ae2fe" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5904 PZ Beveren/Sint-Gillis-Waas/Stekene" . + } +} WHERE { + GRAPH { + ?s core:uuid "541c1603eb8c01968f95d1f262854134499e00d135cd7c9147d307ccbd1e20fd" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5461 PZ DePanne/Koksijde/Nieuwpoort" . + } +} WHERE { + GRAPH { + ?s core:uuid "68ad1301fbb5f209b4ef0fe2b11e77c7bea6011f5e28f8f6875597a7b08f0f1e" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5438 PZ Laarne/Wetteren/Wichelen" . + } +} WHERE { + GRAPH { + ?s core:uuid "c747c462297c0fd1d31076b8f5b20e23aa3309ccb0f5b0b072097aa7612950e9" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5357 PZ Willebroek" . + } +} WHERE { + GRAPH { + ?s core:uuid "ab9269754d1266e010c1878a1199525898f0846ff0e9a0add9e7fbaed42ac43c" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5354 PZ Ranst/Zandhoven" . + } +} WHERE { + GRAPH { + ?s core:uuid "805a977a29725d94f50bf7f0d91a0de1a727c4eec88940e90035f71c6c9b1655" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5400 PZ Zaventem" . + } +} WHERE { + GRAPH { + ?s core:uuid "782682349b24078a97dc181bdb7dc62fb2cabc072878fc75a29f4ed70c86250d" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5905 PZ Beersel/Halle/Sint-Pieters-Leeuw" . + } +} WHERE { + GRAPH { + ?s core:uuid "e4f4aa293734f92302439270cf98805e4b617088cb19144b558db2dff087d886" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5429 PZ Herzele/Sint-Lievens-Houtem/Zottegem" . + } +} WHERE { + GRAPH { + ?s core:uuid "08b125860dd7716256dd35ba2e38a009206555f29adc44642c655450a471ebef" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5365 PZ Herselt/Hulshout/Westerlo" . + } +} WHERE { + GRAPH { + ?s core:uuid "dbfedd56289924d8a7cc26a5aada392281547e053a10c0678238fc08a219fb6e" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5346 PZ Zwijndrecht" . + } +} WHERE { + GRAPH { + ?s core:uuid "330516b323c00851cf4b93e6d5d7a2ef4591f68ae6e71ad9c1f432ee70521bb2" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "5914 PZ Aalter/Maldegem" . + } +} WHERE { + GRAPH { + ?s core:uuid "65EB0324E77A4F2289F6B63D" ; + regorg:legalName ?oldName . + } +} diff --git a/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161909-import-politiezone-alternative-names.sparql b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161909-import-politiezone-alternative-names.sparql new file mode 100644 index 0000000..f78db5b --- /dev/null +++ b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161909-import-politiezone-alternative-names.sparql @@ -0,0 +1,583 @@ +PREFIX core: +PREFIX regorg: +PREFIX skos: + +INSERT { + GRAPH { + ?s skos:altLabel "5408 AMOW" . + } +} WHERE { + GRAPH { + ?s core:uuid "90688b32e0808b6ebbb7b36030526750236527e8019414449065f57ea384ce71" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5462 ARRO IEPER" . + } +} WHERE { + GRAPH { + ?s core:uuid "195d911f1417b20a4b715b1a54e8ae6e92b9a23cde908f2fb03a0081910d8fce" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5359 BoDuKaP" . + } +} WHERE { + GRAPH { + ?s core:uuid "f4838c2bb548a35f92a6ddcf725676b9f137f3fcb11e6737caa7cab1f1314e27" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5399 BRT" . + } +} WHERE { + GRAPH { + ?s core:uuid "81083789b63917e32ab90ef1a45adf893f370ee38da2e0542e5c035db4f60794" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5426 Brakel" . + } +} WHERE { + GRAPH { + ?s core:uuid "b7af3483cb5d0021c6f5864a433b211fce30246ef685621d104b1951915c21c4" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5909 CARMA" . + } +} WHERE { + GRAPH { + ?s core:uuid "e7692f99-9a36-43e3-af78-b320390318dc" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5396 Demerdal-DSZ" . + } +} WHERE { + GRAPH { + ?s core:uuid "41e3bb71cb1fe2763a64ce47ee758fbeb532fbd4348281f34a86a5f88dd71980" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5402 Druivenstreek" . + } +} WHERE { + GRAPH { + ?s core:uuid "b5aee7f43fc9c5d0df74e2cbb9214c03c425cf026b1fd77dd1e3b08e5fc7f875" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5458 Gavers" . + } +} WHERE { + GRAPH { + ?s core:uuid "479036ca47b011e16fefafbe4d3512a44c564804dc26d331ce4dcbe0fa3366d2" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5910 Getevallei" . + } +} WHERE { + GRAPH { + ?s core:uuid "81334af3-1b6f-4308-aca3-107121462d56" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5350 GRENS" . + } +} WHERE { + GRAPH { + ?s core:uuid "4ffd00c0ba7ceab20db24832a4b9963112ed66914dcca05f3e5dc8b8b9d4479d" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5455 Grensleie" . + } +} WHERE { + GRAPH { + ?s core:uuid "e39d8bf95a03ade08ef25a79ebc050abfc81a69731f1de66fe6d031d27135aac" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5372 HANO" . + } +} WHERE { + GRAPH { + ?s core:uuid "77801115dec7f63400134c21d897a41bddb775eb438d81b354ad18fb6d7ab956" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5349 HEKLA" . + } +} WHERE { + GRAPH { + ?s core:uuid "bb9a9db9c00189c27a851f0b772772675cba77e2463ab734477d00e4294db5df" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5389 Hageland" . + } +} WHERE { + GRAPH { + ?s core:uuid "39e0e2e69be463a4628f87bffe7dc6206aa6daa4a5516fb4ce11907f57d77079" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5362 Heist" . + } +} WHERE { + GRAPH { + ?s core:uuid "52bda330e11552b586106748bf652e5dd41163670d5c4226b2c02bfa2f579946" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5393 HerKo" . + } +} WHERE { + GRAPH { + ?s core:uuid "b6fb86dcca01c89d6787801c958d6b8551f3755ec6f1c35bb97c0cf37b9ddc2c" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5447 Het Houtsche" . + } +} WHERE { + GRAPH { + ?s core:uuid "2ca642d589b8012fe65bf54df3a87f740acac78624a902ad378dc4ee6c50a848" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5409 K - L - M" . + } +} WHERE { + GRAPH { + ?s core:uuid "c7778ecc532ee037ab821de348f7c6d98ed5b2401abce2e7da64687290c08962" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5412 KASTZE" . + } +} WHERE { + GRAPH { + ?s core:uuid "7ddda00fc45a0994092bc26f30d97352b7586676438d5557b3f5cc336daab063" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5379 PZ Kanton Borgloon" . + } +} WHERE { + GRAPH { + ?s core:uuid "150440a8bb763d6f53d24ca1c6f1460cb5817c8a261fd90e74aadac3292c3efe" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5367 Kempen N-O" . + } +} WHERE { + GRAPH { + ?s core:uuid "306340a51c1504e59f1c3b85c1ba1b62de8c70cb94d3998f27819761bcee5a98" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5377 Kempenland" . + } +} WHERE { + GRAPH { + ?s core:uuid "ee07affaf869f10517967da1ba7e79151646a1f3621b3cbca591cec2b8c549b7" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5452 Kouter" . + } +} WHERE { + GRAPH { + ?s core:uuid "a32dc005ecbc001abd3338cdacb111895d3053b313654136ef1903035c10a53c" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5853 LaMA" . + } +} WHERE { + GRAPH { + ?s core:uuid "1db0e6fb09e60db1e8534b20c69abb03584870612717a454937717be9b7fd019" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5907 Limburg Regio Hoofdstad" . + } +} WHERE { + GRAPH { + ?s core:uuid "ff7d80dc-ec00-43ac-ac7e-d51694df37ff" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5454 MIDOW" . + } +} WHERE { + GRAPH { + ?s core:uuid "fa52110c7c3e70feab724980e2d991a97712a1deeeb25b168ef6de7b16de41ae" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5351 Minos" . + } +} WHERE { + GRAPH { + ?s core:uuid "80a9ab8eb46716ab23c597d13313ce24b17884ffcbdf00d216b877d57a52ade4" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5457 Mira" . + } +} WHERE { + GRAPH { + ?s core:uuid "7b6bbae823b20191525038cd52089d22128163fb3c7f851ce56149938628d941" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5383 Maasland" . + } +} WHERE { + GRAPH { + ?s core:uuid "97028faf77fd95eb5016a13c19f3a3a8ccf97c6c937398ba96976e52d171dbd8" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5417 Meetjesland Centrum" . + } +} WHERE { + GRAPH { + ?s core:uuid "d8d1b52a9170168ad481f2495652e1b9753aea23385f79710abd86549f1373fa" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5888 MidLim" . + } +} WHERE { + GRAPH { + ?s core:uuid "3efb7cb7fad9f61917093d42513c8a7153120906e9701b08e3560c8f109e64c1" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5369 Neteland" . + } +} WHERE { + GRAPH { + ?s core:uuid "97a393c64a3c30e619bc115ab8b2bbe0bd7a83265ebb8960c0f1154b9628d340" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5348 Noord" . + } +} WHERE { + GRAPH { + ?s core:uuid "0594a740b99274c7347f3492ae4d05f9b05d057a1cbad30683634296e189cc38" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5363 PZ Noorderkempen" . + } +} WHERE { + GRAPH { + ?s core:uuid "b2fdc615ffb131e53a200e14c74ac92d4ed6dac176e3e6ea2c79d227835077c9" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5405 Pajottenland" . + } +} WHERE { + GRAPH { + ?s core:uuid "7cb2089a8c6746d514711908abfd38414a2b01f6ad9a83f28be2e835888b3da7" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5460 Polder" . + } +} WHERE { + GRAPH { + ?s core:uuid "95871bddebd4ad93db54cb1b40d41af29f7ce08f0b59698b0540be129a9a3433" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5453 RIHO" . + } +} WHERE { + GRAPH { + ?s core:uuid "5ba4a42bd459dda75ce452a253ddc09547174265456ad1e3f9389a3ff139a1f9" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5416 Regio Puyenbroeck" . + } +} WHERE { + GRAPH { + ?s core:uuid "9cb5a65d9190da4bb96d0f59882cbcfb34248d354e6bd27101fccba186f4c7b7" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5418 Regio Rhode & Schelde" . + } +} WHERE { + GRAPH { + ?s core:uuid "93389f5157ceb037c5e38d7b8119cef632528b870e91e209c033bc2eac220cc1" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5448 Regio Tielt" . + } +} WHERE { + GRAPH { + ?s core:uuid "39e3e46f7cf031133152e763eaa26cab3df81f842f9912a25c69c445f0c428b8" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5364 Regio Turnhout" . + } +} WHERE { + GRAPH { + ?s core:uuid "a31131dd72b614c89184b331821c10a0f8feb109881a1b164749e9c8941c5e6b" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5913 Rivierenland" . + } +} WHERE { + GRAPH { + ?s core:uuid "81dd243d-f66c-4157-b105-5407aa83cb62" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5403 Politiezone Rode" . + } +} WHERE { + GRAPH { + ?s core:uuid "a691d36ff95b67005d30d5fb89594dab69ec7fdbf975ffdcd36ef9bb39efb06d" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5347 Politiezone Rupel" . + } +} WHERE { + GRAPH { + ?s core:uuid "46616861cfaae13b550a36ae5c05187638df0873024f13043d3f40f24cabf4e6" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5419 Schelde-Leie" . + } +} WHERE { + GRAPH { + ?s core:uuid "c16d166294750ae2c48acae9855a49cd3280a3597c0d8f3257021c68fdede345" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5459 Spoorkin" . + } +} WHERE { + GRAPH { + ?s core:uuid "a62fddadcb0a8fb878c3edbdc71a4eb1e6c419b212d41a8bd589fb1a370eb112" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5407 TARL" . + } +} WHERE { + GRAPH { + ?s core:uuid "0610b306e95fae751dc07050565e987f31ba06420863bc44616b2e05452d8822" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5456 VLAS" . + } +} WHERE { + GRAPH { + ?s core:uuid "477e468496131b7d35f145b0361bca5c2cad577fd9ec27d385d703942dc944d0" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5425 Vlaamse Ardennen" . + } +} WHERE { + GRAPH { + ?s core:uuid "4deae42b2b25bff407f5abc7cbb6d62eb02afaf2892086341c324fdf2c0e6e92" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5908 Voer en Dijle" . + } +} WHERE { + GRAPH { + ?s core:uuid "cdcd4403-d4cd-4400-80a3-9882d79933f4" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5355 Voorkempen" . + } +} WHERE { + GRAPH { + ?s core:uuid "5dab8a7b0656aaf0db13044fcafc0088f9f0b7776c294a6e9abfdbf7420effae" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5401 Wokra" . + } +} WHERE { + GRAPH { + ?s core:uuid "beff71011cde3ac0ee0d94b592462be141cc9f0deb5c6ea996ea191bf79ae2fe" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5904 Waasland-Noord" . + } +} WHERE { + GRAPH { + ?s core:uuid "541c1603eb8c01968f95d1f262854134499e00d135cd7c9147d307ccbd1e20fd" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5461 Westkust" . + } +} WHERE { + GRAPH { + ?s core:uuid "68ad1301fbb5f209b4ef0fe2b11e77c7bea6011f5e28f8f6875597a7b08f0f1e" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5354 ZARA" . + } +} WHERE { + GRAPH { + ?s core:uuid "805a977a29725d94f50bf7f0d91a0de1a727c4eec88940e90035f71c6c9b1655" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5905 Zennevallei" . + } +} WHERE { + GRAPH { + ?s core:uuid "e4f4aa293734f92302439270cf98805e4b617088cb19144b558db2dff087d886" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "5365 Zuiderkempen" . + } +} WHERE { + GRAPH { + ?s core:uuid "dbfedd56289924d8a7cc26a5aada392281547e053a10c0678238fc08a219fb6e" . + } +} diff --git a/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161910-import-hvz-juridical-names.sparql b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161910-import-hvz-juridical-names.sparql new file mode 100644 index 0000000..2c5ce6e --- /dev/null +++ b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161910-import-hvz-juridical-names.sparql @@ -0,0 +1,303 @@ +PREFIX core: +PREFIX regorg: +PREFIX skos: + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweer Westhoek" . + } +} WHERE { + GRAPH { + ?s core:uuid "c74e71fb4ccf2e143731873471a890b87076a9b1dcc470b937b339d7c191fce4" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweer Zone Antwerpen" . + } +} WHERE { + GRAPH { + ?s core:uuid "c8d171d9735146131fcb9e2ad7f4e271585b0bf68f7a43d8873b6848576d13a1" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweer Zone Centrum" . + } +} WHERE { + GRAPH { + ?s core:uuid "4bb83a0635b69132a4de91667c0a30f228720bda01584b3a01c4cf7ddfc12664" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweer zone Kempen" . + } +} WHERE { + GRAPH { + ?s core:uuid "215d1409dda860a1ce4f39f1f6c082c5662620d9d29de456f4242fb6cc6df0b5" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweerzone Midwest" . + } +} WHERE { + GRAPH { + ?s core:uuid "b312420a9e4331da36afd70237db5061825cacadcdaa68e6ad0f1ea8a9426f77" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweerzone Oost-Limburg" . + } +} WHERE { + GRAPH { + ?s core:uuid "7800a6f5e9c3f646e274b280703730ed5e83fe0cba1f0d6c7fb18141337fe781" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweer Zone Rand" . + } +} WHERE { + GRAPH { + ?s core:uuid "2d25be1712e809bbeed7d439c93bace752e0742f6b2ed9802302dec9a8906e2a" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone West" . + } +} WHERE { + GRAPH { + ?s core:uuid "b3e202bf5ab9d30f1928f7a1ea8911c60da595819774702eb1745e83c25cf106" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Fluvia" . + } +} WHERE { + GRAPH { + ?s core:uuid "9d0e3fc23f4fb9c23cbcc30474a1e518c9725c069255090d46eb58c13d62baef" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Meetjesland" . + } +} WHERE { + GRAPH { + ?s core:uuid "0e951dd15341d38413bf809f16ef5f1bd163092001ac04ce78a4de5b5e9cdd37" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Noord-Limburg" . + } +} WHERE { + GRAPH { + ?s core:uuid "505e727b7b078c3eb9a05f754d834fca559d28cb3cdb02d5e4cdb3be300ea699" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweerzone Oost" . + } +} WHERE { + GRAPH { + ?s core:uuid "db299add14cc24e7a99ce4eb51015f32925690fb9816962e500f3341842ef6fa" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Oost" . + } +} WHERE { + GRAPH { + ?s core:uuid "9fdf19f0cfc9e12bd58fc10c4da6e8c6c40e813ec5b9f3bdde92cb00ecd972fe" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweerzone Rivierenland" . + } +} WHERE { + GRAPH { + ?s core:uuid "98967d1e1e3dd66ac9e32bd1d536ee8e85c9126cc5fc04354a335d5aabcf9b01" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Taxandria" . + } +} WHERE { + GRAPH { + ?s core:uuid "c1fcc0a6c6132cb34dff9ed6e6f361d1587c211ac8ec1ddef409510bf68b724b" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Brandweerzone Vlaamse Ardennen" . + } +} WHERE { + GRAPH { + ?s core:uuid "bfc36f138e0c7d11757eb321d034cfbffce281679eae93c2bc5df1048aa05789" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Waasland" . + } +} WHERE { + GRAPH { + ?s core:uuid "e8bd746e2dc3c5a72fe4fb3da0c92803b0728150bdd66e860d6218bc83098941" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone 1" . + } +} WHERE { + GRAPH { + ?s core:uuid "2c1fc56876479e83c7b144e98b84174dd10087ae59621204b9d6701d968e8aba" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Zuid-Oost" . + } +} WHERE { + GRAPH { + ?s core:uuid "db5adb1e2e7ad0e33725b83edda44f9b4638e328a1534a1b4eef2683d337975a" ; + regorg:legalName ?oldName . + } +} + +DELETE { + GRAPH { + ?s regorg:legalName ?oldName . + } +} INSERT { + GRAPH { + ?s regorg:legalName "Hulpverleningszone Zuidwest" . + } +} WHERE { + GRAPH { + ?s core:uuid "a3b32431cfbb18905e2c7deeaf9ef7af35cd17c55d053a05ed9cd8fdec550724" ; + regorg:legalName ?oldName . + } +} diff --git a/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161911-import-hvz-alternative-names.sparql b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161911-import-hvz-alternative-names.sparql new file mode 100644 index 0000000..bd4c533 --- /dev/null +++ b/config/migrations/2024/20240311134000-import-pz-hvz-names/20240311161911-import-hvz-alternative-names.sparql @@ -0,0 +1,203 @@ +PREFIX core: +PREFIX regorg: +PREFIX skos: + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Westhoek" . + } +} WHERE { + GRAPH { + ?s core:uuid "c74e71fb4ccf2e143731873471a890b87076a9b1dcc470b937b339d7c191fce4" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Zone Antwerpen" . + } +} WHERE { + GRAPH { + ?s core:uuid "c8d171d9735146131fcb9e2ad7f4e271585b0bf68f7a43d8873b6848576d13a1" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Zone Centrum" . + } +} WHERE { + GRAPH { + ?s core:uuid "4bb83a0635b69132a4de91667c0a30f228720bda01584b3a01c4cf7ddfc12664" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Zone Kempen" . + } +} WHERE { + GRAPH { + ?s core:uuid "215d1409dda860a1ce4f39f1f6c082c5662620d9d29de456f4242fb6cc6df0b5" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Zone Midwest" . + } +} WHERE { + GRAPH { + ?s core:uuid "b312420a9e4331da36afd70237db5061825cacadcdaa68e6ad0f1ea8a9426f77" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Zone Oost-Limburg" . + } +} WHERE { + GRAPH { + ?s core:uuid "7800a6f5e9c3f646e274b280703730ed5e83fe0cba1f0d6c7fb18141337fe781" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Zone Rand" . + } +} WHERE { + GRAPH { + ?s core:uuid "2d25be1712e809bbeed7d439c93bace752e0742f6b2ed9802302dec9a8906e2a" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Brandweer Zone Vlaams-Brabant West" . + } +} WHERE { + GRAPH { + ?s core:uuid "b3e202bf5ab9d30f1928f7a1ea8911c60da595819774702eb1745e83c25cf106" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Fluvia" . + } +} WHERE { + GRAPH { + ?s core:uuid "9d0e3fc23f4fb9c23cbcc30474a1e518c9725c069255090d46eb58c13d62baef" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Meetjesland" . + } +} WHERE { + GRAPH { + ?s core:uuid "0e951dd15341d38413bf809f16ef5f1bd163092001ac04ce78a4de5b5e9cdd37" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Noord-Limburg" . + } +} WHERE { + GRAPH { + ?s core:uuid "505e727b7b078c3eb9a05f754d834fca559d28cb3cdb02d5e4cdb3be300ea699" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Oost" . + } +} WHERE { + GRAPH { + ?s core:uuid "db299add14cc24e7a99ce4eb51015f32925690fb9816962e500f3341842ef6fa" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Oost-Vlaams-Brabant" . + } +} WHERE { + GRAPH { + ?s core:uuid "9fdf19f0cfc9e12bd58fc10c4da6e8c6c40e813ec5b9f3bdde92cb00ecd972fe" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Rivierenland" . + } +} WHERE { + GRAPH { + ?s core:uuid "98967d1e1e3dd66ac9e32bd1d536ee8e85c9126cc5fc04354a335d5aabcf9b01" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Taxandria" . + } +} WHERE { + GRAPH { + ?s core:uuid "c1fcc0a6c6132cb34dff9ed6e6f361d1587c211ac8ec1ddef409510bf68b724b" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Vlaamse Ardennen" . + } +} WHERE { + GRAPH { + ?s core:uuid "bfc36f138e0c7d11757eb321d034cfbffce281679eae93c2bc5df1048aa05789" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Waasland" . + } +} WHERE { + GRAPH { + ?s core:uuid "e8bd746e2dc3c5a72fe4fb3da0c92803b0728150bdd66e860d6218bc83098941" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Zone 1" . + } +} WHERE { + GRAPH { + ?s core:uuid "2c1fc56876479e83c7b144e98b84174dd10087ae59621204b9d6701d968e8aba" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Zuid-Oost" . + } +} WHERE { + GRAPH { + ?s core:uuid "db5adb1e2e7ad0e33725b83edda44f9b4638e328a1534a1b4eef2683d337975a" . + } +} + +INSERT { + GRAPH { + ?s skos:altLabel "HVZ Zuid-West-Limburg" . + } +} WHERE { + GRAPH { + ?s core:uuid "a3b32431cfbb18905e2c7deeaf9ef7af35cd17c55d053a05ed9cd8fdec550724" . + } +} From 20bf82a36a75421f7c33314ffbb2d24c600912c7 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 19 Mar 2024 11:48:22 +0100 Subject: [PATCH 33/48] added Boeddistisch and Niet-confessioneel to reconized worship type and linked to Representative Organ --- ...01-add-new-recognized-worship-types.sparql | 27 +++++++++++++++++++ ...missing-types-representative-bodies.sparql | 15 +++++++++++ 2 files changed, 42 insertions(+) create mode 100644 config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql create mode 100644 config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql diff --git a/config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql b/config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql new file mode 100644 index 0000000..9799562 --- /dev/null +++ b/config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql @@ -0,0 +1,27 @@ +PREFIX code: +PREFIX skos: +PREFIX core: + +INSERT { + GRAPH { + a code:TypeEredienst ; + core:uuid "cbd4c767ea184b41bf51b65d406754d4" ; + skos:prefLabel "Niet-confessioneel" ; + skos:inScheme ; + skos:inScheme ; + skos:topConceptOf . + } +} + +; + +INSERT { + GRAPH { + a code:TypeEredienst ; + core:uuid "f076c85e72814278814776b038ac33f7" ; + skos:prefLabel "Boeddhistisch" ; + skos:inScheme ; + skos:inScheme ; + skos:topConceptOf . + } +} \ No newline at end of file diff --git a/config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql b/config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql new file mode 100644 index 0000000..aaf2b79 --- /dev/null +++ b/config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql @@ -0,0 +1,15 @@ +PREFIX ere: + +INSERT { + GRAPH { + a ere:RepresentatiefOrgaan ; + ere:typeEredienst + } +} +; +INSERT { + GRAPH { + a ere:RepresentatiefOrgaan ; + ere:typeEredienst + } +} \ No newline at end of file From 7c625b33480a537e5ca902a2d05681a0289b211e Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 19 Mar 2024 11:51:07 +0100 Subject: [PATCH 34/48] fixed typo boeddistiche to boeddistische --- ...-typo-boeddistiche-to-boeddistische.sparql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 config/migrations/2024/20240318151601-fix-typo-boeddistiche-to-boeddistische.sparql diff --git a/config/migrations/2024/20240318151601-fix-typo-boeddistiche-to-boeddistische.sparql b/config/migrations/2024/20240318151601-fix-typo-boeddistiche-to-boeddistische.sparql new file mode 100644 index 0000000..0923f6f --- /dev/null +++ b/config/migrations/2024/20240318151601-fix-typo-boeddistiche-to-boeddistische.sparql @@ -0,0 +1,26 @@ +PREFIX skos: +PREFIX core: +PREFIX ere: +PREFIX regorg: + + +DELETE{ + GRAPH { + ?s skos:prefLabel ?name ; + regorg:legalName ?legalName . + } +} +INSERT { + GRAPH { + ?s skos:prefLabel "Boeddhistische Unie van België" ; + regorg:legalName "Boeddhistische Unie van België" . + } +} +WHERE { + GRAPH { + ?s a ere:RepresentatiefOrgaan ; + core:uuid "5871503aa86b44cd470f97228a2ce413" ; + skos:prefLabel ?name ; + regorg:legalName ?legalName . + } +} \ No newline at end of file From d42986ff43a1a7ae04a9dad3d4868adb8f99ac0e Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 21 Mar 2024 13:26:52 +0100 Subject: [PATCH 35/48] added reasoner to private-info --- config/reasoner/dl2op/main-info/mapping.n3 | 55 ++++++++++-- config/reasoner/dl2op/main/mapping.n3 | 37 ++++++-- config/reasoner/dl2op/private-info/mapping.n3 | 87 +++++++++++++++---- 3 files changed, 145 insertions(+), 34 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 6166723..f967a1c 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -71,30 +71,41 @@ PREFIX ere: # Test # ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. { - ?s mandaat:bindingeinde ?eindeDate. + ?s mandaat:bindingEinde ?eindeDate. # use backward arrow rule defined below ?eindeDate :dateTimeFromDate ?eindeDateTime. { - ?s mandaat:bindingeinde ?eindeDate + ?s mandaat:bindingEinde ?eindeDate } e:becomes { - ?s mandaat:bindingeinde ?eindeDateTime + ?s mandaat:bindingEinde ?eindeDateTime }. } => { - ?s mandaat:bindingeinde ?eindeDateTime + ?s mandaat:bindingEinde ?eindeDateTime +}. +{ + ?s mandaat:bindingEinde ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:bindingEinde ?eindeDate + } e:becomes { + ?s mandaat:bindingEinde ?eindeDateTime + }. +} => { + ?s mandaat:bindingEinde ?eindeDateTime }. - { - ?s mandaat:bindingstart ?startDate. + ?s mandaat:bindingStart ?startDate. # use backward arrow rule defined below ?startDate :dateTimeFromDate ?startDateTime. { - ?s mandaat:bindingstart ?startDate + ?s mandaat:bindingStart ?startDate } e:becomes { - ?s mandaat:bindingstart ?startDateTime + ?s mandaat:bindingStart ?startDateTime }. } => { - ?s mandaat:bindingstart ?startDateTime + ?s mandaat:bindingStart ?startDateTime }. { ?s ch:startdatum ?startDate. @@ -109,6 +120,32 @@ PREFIX ere: ?s ch:startdatum ?startDateTime }. +{ + ?s mandaat:start ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:start ?eindeDate + } e:becomes { + ?s mandaat:start ?eindeDateTime + }. +} => { + ?s mandaat:start ?eindeDateTime +}. + +{ + ?s mandaat:einde ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:einde ?eindeDate + } e:becomes { + ?s mandaat:einde ?eindeDateTime + }. +} => { + ?s mandaat:einde ?eindeDateTime +}. + { ?s ch:eindedatum ?endDate. # use backward arrow rule defined below diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 9d57423..f50f7ae 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -73,26 +73,51 @@ PREFIX lblodlg: # use backward arrow rule defined below ?eindeDate :dateTimeFromDate ?eindeDateTime. { - ?s mandaat:bindingeinde ?eindeDate + ?s mandaat:bindingEinde ?eindeDate } e:becomes { - ?s mandaat:bindingeinde ?eindeDateTime + ?s mandaat:bindingEinde ?eindeDateTime }. } => { - ?s mandaat:bindingeinde ?eindeDateTime + ?s mandaat:bindingEinde ?eindeDateTime }. +{ + ?s mandaat:start ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:start ?eindeDate + } e:becomes { + ?s mandaat:start ?eindeDateTime + }. +} => { + ?s mandaat:start ?eindeDateTime +}. + +{ + ?s mandaat:einde ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:einde ?eindeDate + } e:becomes { + ?s mandaat:einde ?eindeDateTime + }. +} => { + ?s mandaat:einde ?eindeDateTime +}. { ?s mandaat:bindingstart ?startDate. # use backward arrow rule defined below ?startDate :dateTimeFromDate ?startDateTime. { - ?s mandaat:bindingstart ?startDate + ?s mandaat:bindingStart ?startDate } e:becomes { - ?s mandaat:bindingstart ?startDateTime + ?s mandaat:bindingStart ?startDateTime }. } => { - ?s mandaat:bindingstart ?startDateTime + ?s mandaat:bindingStart ?startDateTime }. { diff --git a/config/reasoner/dl2op/private-info/mapping.n3 b/config/reasoner/dl2op/private-info/mapping.n3 index 82bebd9..6debd28 100644 --- a/config/reasoner/dl2op/private-info/mapping.n3 +++ b/config/reasoner/dl2op/private-info/mapping.n3 @@ -66,32 +66,82 @@ PREFIX xsd: # Test # ex:s "2019-01-01T19:32:52+00:00"^^xsd:dateTime. { - ?s mandaat:start ?startDateTime. + ?s mandaat:bindingeinde ?eindeDate. # use backward arrow rule defined below - ?startDateTime :dateFromDateTime ?startDate. + ?eindeDate :dateTimeFromDate ?eindeDateTime. { - ?s mandaat:start ?startDateTime + ?s mandaat:bindingEinde ?eindeDate } e:becomes { - ?s mandaat:start ?startDate + ?s mandaat:bindingEinde ?eindeDateTime }. } => { - ?s mandaat:start ?startDate + ?s mandaat:bindingEinde ?eindeDateTime }. -# ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. { - ?s mandaat:einde ?eindeDateTime. + ?s mandaat:start ?eindeDate. # use backward arrow rule defined below - ?eindeDateTime :dateFromDateTime ?eindeDate. + ?eindeDate :dateTimeFromDate ?eindeDateTime. { - ?s mandaat:einde ?eindeDateTime + ?s mandaat:start ?eindeDate } e:becomes { - ?s mandaat:einde ?eindeDate + ?s mandaat:start ?eindeDateTime }. } => { - ?s mandaat:einde ?eindeDate + ?s mandaat:start ?eindeDateTime }. +{ + ?s mandaat:einde ?eindeDate. + # use backward arrow rule defined below + ?eindeDate :dateTimeFromDate ?eindeDateTime. + { + ?s mandaat:einde ?eindeDate + } e:becomes { + ?s mandaat:einde ?eindeDateTime + }. +} => { + ?s mandaat:einde ?eindeDateTime +}. + +{ + ?s mandaat:bindingstart ?startDate. + # use backward arrow rule defined below + ?startDate :dateTimeFromDate ?startDateTime. + { + ?s mandaat:bindingStart ?startDate + } e:becomes { + ?s mandaat:bindingStart ?startDateTime + }. +} => { + ?s mandaat:bindingStart ?startDateTime +}. + +{ + ?s ch:startdatum ?startDate. + # use backward arrow rule defined below + ?startDate :dateTimeFromDate ?startDateTime. + { + ?s ch:startdatum ?startDate + } e:becomes { + ?s ch:startdatum ?startDateTime + }. +} => { + ?s ch:startdatum ?startDateTime +}. + +{ + ?s ch:eindedatum ?endDate. + # use backward arrow rule defined below + ?endDate :dateTimeFromDate ?endDateTime. + { + ?s ch:eindedatum ?endDate + } e:becomes { + ?s ch:eindedatum ?endDateTime + }. +} => { + ?s ch:eindedatum ?endDateTime +}. # Backward arrow rule is like a function call. # Removes time info in the returned date @@ -104,16 +154,15 @@ PREFIX xsd: # So, the following rule adds 2 hours to the datetime, and then takes the date part of the UTC date time # to come to the date that the DL user selected (in CE(S)T) { - ?dateTime :dateFromDateTime ?date -} <= { - (?dateTimeLiteral xsd:dateTime) log:dtlit ?dateTime. - (?dateTime "PT2H"^^xsd:dayTimeDuration) func:add-dayTimeDuration-to-dateTime ?localDateTime. - (?localDateTimeLiteral xsd:dateTime) log:dtlit ?localDateTime. - (?localDateTimeLiteral 0 11) func:substring ?dateLiteral. - (?dateLiteral xsd:date) log:dtlit ?date. + ?date :dateTimeFromDate ?dateTime +} +<= +{ + ( ?date 1 10 ) string:substring ?dateSolo . + (?dateSolo "T00:00:00") string:concatenation ?datePlusTime. + (?datePlusTime xsd:dateTime) log:dtlit ?dateTime . }. - # ex:orgA besluit:classificatie . { { From 0b3d1febdfb3744d8956d5838f96c1c6ed7a7afa Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 21 Mar 2024 13:59:38 +0100 Subject: [PATCH 36/48] added 2 hours extra to timezone to prevent duplpication --- config/reasoner/dl2op/main-info/mapping.n3 | 2 +- config/reasoner/dl2op/main/mapping.n3 | 2 +- config/reasoner/dl2op/private-info/mapping.n3 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index f967a1c..2b7ee60 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -189,7 +189,7 @@ PREFIX ere: <= { ( ?date 1 10 ) string:substring ?dateSolo . - (?dateSolo "T00:00:00") string:concatenation ?datePlusTime. + (?dateSolo "T02:00:00") string:concatenation ?datePlusTime. (?datePlusTime xsd:dateTime) log:dtlit ?dateTime . }. diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index f50f7ae..4726fcc 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -163,7 +163,7 @@ PREFIX lblodlg: <= { ( ?date 1 10 ) string:substring ?dateSolo . - (?dateSolo "T00:00:00") string:concatenation ?datePlusTime. + (?dateSolo "T02:00:00") string:concatenation ?datePlusTime. (?datePlusTime xsd:dateTime) log:dtlit ?dateTime . }. diff --git a/config/reasoner/dl2op/private-info/mapping.n3 b/config/reasoner/dl2op/private-info/mapping.n3 index 6debd28..c47268f 100644 --- a/config/reasoner/dl2op/private-info/mapping.n3 +++ b/config/reasoner/dl2op/private-info/mapping.n3 @@ -159,7 +159,7 @@ PREFIX xsd: <= { ( ?date 1 10 ) string:substring ?dateSolo . - (?dateSolo "T00:00:00") string:concatenation ?datePlusTime. + (?dateSolo "T02:00:00") string:concatenation ?datePlusTime. (?datePlusTime xsd:dateTime) log:dtlit ?dateTime . }. From 8755bbc4321a7a117d2c7d60d724346831ad7bc6 Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 21 Mar 2024 15:35:22 +0100 Subject: [PATCH 37/48] fix/refactor: removed duplicate rule, correct predicate names, improved variable names --- config/reasoner/dl2op/main-info/mapping.n3 | 22 +++------- config/reasoner/dl2op/main/mapping.n3 | 14 +++---- config/reasoner/dl2op/private-info/mapping.n3 | 42 +++++++++---------- 3 files changed, 33 insertions(+), 45 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 2b7ee60..6a4cdd1 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -82,18 +82,6 @@ PREFIX ere: } => { ?s mandaat:bindingEinde ?eindeDateTime }. -{ - ?s mandaat:bindingEinde ?eindeDate. - # use backward arrow rule defined below - ?eindeDate :dateTimeFromDate ?eindeDateTime. - { - ?s mandaat:bindingEinde ?eindeDate - } e:becomes { - ?s mandaat:bindingEinde ?eindeDateTime - }. -} => { - ?s mandaat:bindingEinde ?eindeDateTime -}. { ?s mandaat:bindingStart ?startDate. @@ -121,16 +109,16 @@ PREFIX ere: }. { - ?s mandaat:start ?eindeDate. + ?s mandaat:start ?startDate. # use backward arrow rule defined below - ?eindeDate :dateTimeFromDate ?eindeDateTime. + ?startDate :dateTimeFromDate ?startDateTime. { - ?s mandaat:start ?eindeDate + ?s mandaat:start ?startDate } e:becomes { - ?s mandaat:start ?eindeDateTime + ?s mandaat:start ?startDateTime }. } => { - ?s mandaat:start ?eindeDateTime + ?s mandaat:start ?startDateTime }. { diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 4726fcc..268d389 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -69,7 +69,7 @@ PREFIX lblodlg: # Test # ex:s "2019-02-01T10:32:52+00:00"^^xsd:dateTime. { - ?s mandaat:bindingeinde ?eindeDate. + ?s mandaat:bindingEinde ?eindeDate. # use backward arrow rule defined below ?eindeDate :dateTimeFromDate ?eindeDateTime. { @@ -82,16 +82,16 @@ PREFIX lblodlg: }. { - ?s mandaat:start ?eindeDate. + ?s mandaat:start ?startDate. # use backward arrow rule defined below - ?eindeDate :dateTimeFromDate ?eindeDateTime. + ?startDate :dateTimeFromDate ?startDateTime. { - ?s mandaat:start ?eindeDate + ?s mandaat:start ?startDate } e:becomes { - ?s mandaat:start ?eindeDateTime + ?s mandaat:start ?startDateTime }. } => { - ?s mandaat:start ?eindeDateTime + ?s mandaat:start ?startDateTime }. { @@ -108,7 +108,7 @@ PREFIX lblodlg: }. { - ?s mandaat:bindingstart ?startDate. + ?s mandaat:bindingStart ?startDate. # use backward arrow rule defined below ?startDate :dateTimeFromDate ?startDateTime. { diff --git a/config/reasoner/dl2op/private-info/mapping.n3 b/config/reasoner/dl2op/private-info/mapping.n3 index c47268f..e230655 100644 --- a/config/reasoner/dl2op/private-info/mapping.n3 +++ b/config/reasoner/dl2op/private-info/mapping.n3 @@ -66,7 +66,20 @@ PREFIX xsd: # Test # ex:s "2019-01-01T19:32:52+00:00"^^xsd:dateTime. { - ?s mandaat:bindingeinde ?eindeDate. + ?s mandaat:bindingStart ?startDate. + # use backward arrow rule defined below + ?startDate :dateTimeFromDate ?startDateTime. + { + ?s mandaat:bindingStart ?startDate + } e:becomes { + ?s mandaat:bindingStart ?startDateTime + }. +} => { + ?s mandaat:bindingStart ?startDateTime +}. + +{ + ?s mandaat:bindingEinde ?eindeDate. # use backward arrow rule defined below ?eindeDate :dateTimeFromDate ?eindeDateTime. { @@ -79,16 +92,16 @@ PREFIX xsd: }. { - ?s mandaat:start ?eindeDate. + ?s mandaat:start ?startDate. # use backward arrow rule defined below - ?eindeDate :dateTimeFromDate ?eindeDateTime. + ?startDate :dateTimeFromDate ?startDateTime. { - ?s mandaat:start ?eindeDate + ?s mandaat:start ?startDate } e:becomes { - ?s mandaat:start ?eindeDateTime + ?s mandaat:start ?startDateTime }. } => { - ?s mandaat:start ?eindeDateTime + ?s mandaat:start ?startDateTime }. { @@ -104,19 +117,6 @@ PREFIX xsd: ?s mandaat:einde ?eindeDateTime }. -{ - ?s mandaat:bindingstart ?startDate. - # use backward arrow rule defined below - ?startDate :dateTimeFromDate ?startDateTime. - { - ?s mandaat:bindingStart ?startDate - } e:becomes { - ?s mandaat:bindingStart ?startDateTime - }. -} => { - ?s mandaat:bindingStart ?startDateTime -}. - { ?s ch:startdatum ?startDate. # use backward arrow rule defined below @@ -155,8 +155,8 @@ PREFIX xsd: # to come to the date that the DL user selected (in CE(S)T) { ?date :dateTimeFromDate ?dateTime -} -<= +} +<= { ( ?date 1 10 ) string:substring ?dateSolo . (?dateSolo "T02:00:00") string:concatenation ?datePlusTime. From 19f9d6f4e84578fef308b0bdd0659d3a16b00a41 Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 21 Mar 2024 16:27:57 +0100 Subject: [PATCH 38/48] refactor: update backward arrow rule comment --- config/reasoner/dl2op/main-info/mapping.n3 | 15 +++++---------- config/reasoner/dl2op/main/mapping.n3 | 14 +++++--------- config/reasoner/dl2op/private-info/mapping.n3 | 14 +++++--------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/config/reasoner/dl2op/main-info/mapping.n3 b/config/reasoner/dl2op/main-info/mapping.n3 index 6a4cdd1..326b028 100644 --- a/config/reasoner/dl2op/main-info/mapping.n3 +++ b/config/reasoner/dl2op/main-info/mapping.n3 @@ -161,16 +161,11 @@ PREFIX ere: }. # Backward arrow rule is like a function call. -# Removes time info in the returned date -# The user in DL selects a date via the UI. -# These dates are persisted as midnight dateTimes in UTC. -# Meaning that 1st of July is stored as -# "2022-06-30T22:00:00Z"^^xsd:dateTime -# and 1 December -# "2022-11-30T23:00:00Z"^^xsd:dateTime -# So, the following rule adds 2 hours to the datetime, and then takes the date part of the UTC date time -# to come to the date that the DL user selected (in CE(S)T) -# To make sure the date have the same convention we now save them as datetime without the timezone indicator +# Removes the timezone indicator "Z" from incoming datetimes +# To make sure all datetimes have the same convention we now save them as +# datetime without the timezone indicator +# We use "T02:00:00" as time indicator to work around a virtuoso bug that +# results in datetimes being converted to a date when using "T00:00:00" { ?date :dateTimeFromDate ?dateTime } diff --git a/config/reasoner/dl2op/main/mapping.n3 b/config/reasoner/dl2op/main/mapping.n3 index 268d389..a0fa3ba 100644 --- a/config/reasoner/dl2op/main/mapping.n3 +++ b/config/reasoner/dl2op/main/mapping.n3 @@ -148,15 +148,11 @@ PREFIX lblodlg: # Backward arrow rule is like a function call. -# Removes time info in the returned date -# The user in DL selects a date via the UI. -# These dates are persisted as midnight dateTimes in UTC. -# Meaning that 1st of July is stored as -# "2022-06-30T22:00:00Z"^^xsd:dateTime -# and 1 December -# "2022-11-30T23:00:00Z"^^xsd:dateTime -# So, the following rule adds 2 hours to the datetime, and then takes the date part of the UTC date time -# To make sure the date have the same convention we now save them as datetime without the timezone indicator +# Removes the timezone indicator "Z" from incoming datetimes +# To make sure all datetimes have the same convention we now save them as +# datetime without the timezone indicator +# We use "T02:00:00" as time indicator to work around a virtuoso bug that +# results in datetimes being converted to a date when using "T00:00:00" { ?date :dateTimeFromDate ?dateTime } diff --git a/config/reasoner/dl2op/private-info/mapping.n3 b/config/reasoner/dl2op/private-info/mapping.n3 index e230655..c410991 100644 --- a/config/reasoner/dl2op/private-info/mapping.n3 +++ b/config/reasoner/dl2op/private-info/mapping.n3 @@ -144,15 +144,11 @@ PREFIX xsd: }. # Backward arrow rule is like a function call. -# Removes time info in the returned date -# The user in DL selects a date via the UI. -# These dates are persisted as midnight dateTimes in UTC. -# Meaning that 1st of July is stored as -# "2022-06-30T22:00:00Z"^^xsd:dateTime -# and 1 December -# "2022-11-30T23:00:00Z"^^xsd:dateTime -# So, the following rule adds 2 hours to the datetime, and then takes the date part of the UTC date time -# to come to the date that the DL user selected (in CE(S)T) +# Removes the timezone indicator "Z" from incoming datetimes +# To make sure all datetimes have the same convention we now save them as +# datetime without the timezone indicator +# We use "T02:00:00" as time indicator to work around a virtuoso bug that +# results in datetimes being converted to a date when using "T00:00:00" { ?date :dateTimeFromDate ?dateTime } From 6ec4784a53150a6c409c2bfffc18a64900bbea18 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Mon, 25 Mar 2024 13:25:53 +0100 Subject: [PATCH 39/48] chore: Bump frontend to v1.23.0-0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 84821cc..3b18f36 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.22.0 + image: lblod/frontend-organization-portal:1.23.0-0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 54f1d8932c88ae8eeb648646a47651a654249297 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Wed, 27 Mar 2024 09:52:28 +0100 Subject: [PATCH 40/48] Add `remove-stale-jobs.sparql-template` migration --- config/migrations-sample/README.md | 1 + .../remove-stale-jobs.sparql-template | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 config/migrations-sample/remove-stale-jobs.sparql-template diff --git a/config/migrations-sample/README.md b/config/migrations-sample/README.md index e506f8b..c5aa12e 100644 --- a/config/migrations-sample/README.md +++ b/config/migrations-sample/README.md @@ -11,4 +11,5 @@ In addition, these files can function as templates or provide inspiration for fu ## Template files - `pseudonimyze-data.sparql-template` - the file that contains the sparql for pseudonymizing data in the triplestore. It should run every time the db is "refreshed" with a copy from PROD. +- `remove-stale-jobs.sparql-template` - removing `busy` and `scheduled` jobs. - `remove-type-in-producer-graph.sparql-template` - the migration to handle the occasional sync issue between OP and Loket. diff --git a/config/migrations-sample/remove-stale-jobs.sparql-template b/config/migrations-sample/remove-stale-jobs.sparql-template new file mode 100644 index 0000000..a0120a4 --- /dev/null +++ b/config/migrations-sample/remove-stale-jobs.sparql-template @@ -0,0 +1,25 @@ +PREFIX mu: +PREFIX task: +PREFIX dct: +PREFIX prov: +PREFIX nie: +PREFIX ext: +PREFIX oslc: +PREFIX cogs: +PREFIX adms: + +DELETE { + GRAPH ?g { + ?jobUri a . + ?jobUri adms:status ?status. + ?jobUri ?p ?o + } +} +WHERE { + GRAPH ?g { + ?jobUri a . + ?jobUri adms:status ?status. + ?jobUri ?p ?o + FILTER(?status IN (, )) + } +} From 6c572992beeaf0e2dadbc6223069eaad0b0bf739 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Wed, 27 Mar 2024 16:17:41 +0100 Subject: [PATCH 41/48] Revert "Merge pull request #387 from lblod/feat/exclude-clb-data-from-producer" This reverts commit 25a5adaf5eafba9502f7183d83fcf9d836055cb9, reversing changes made to c6bb94816d718a1a47ce68bcf9d3583eeac3aece. --- .../organizations-public-info/export.json | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/config/delta-producer/organizations-public-info/export.json b/config/delta-producer/organizations-public-info/export.json index 2d755ff..100be72 100644 --- a/config/delta-producer/organizations-public-info/export.json +++ b/config/delta-producer/organizations-public-info/export.json @@ -15,6 +15,8 @@ "http://www.w3.org/2004/02/skos/core#altLabel", "http://www.w3.org/ns/adms#identifier", "http://www.w3.org/ns/regorg#orgStatus", + "http://www.w3.org/ns/org#hasPrimarySite", + "http://www.w3.org/ns/org#hasSite", "http://www.w3.org/ns/org#changedBy", "http://www.w3.org/ns/org#resultedFrom", "http://www.w3.org/ns/org#hasPost", @@ -40,6 +42,8 @@ "http://www.w3.org/2004/02/skos/core#altLabel", "http://www.w3.org/ns/adms#identifier", "http://www.w3.org/ns/regorg#orgStatus", + "http://www.w3.org/ns/org#hasPrimarySite", + "http://www.w3.org/ns/org#hasSite", "http://www.w3.org/ns/org#changedBy", "http://www.w3.org/ns/org#resultedFrom", "http://www.w3.org/ns/org#hasPost", @@ -73,6 +77,8 @@ "http://www.w3.org/ns/org#changedBy", "http://www.w3.org/ns/org#classification", "http://www.w3.org/ns/org#hasPost", + "http://www.w3.org/ns/org#hasPrimarySite", + "http://www.w3.org/ns/org#hasSite", "http://www.w3.org/ns/org#hasSubOrganization", "http://www.w3.org/ns/org#linkedTo", "http://www.w3.org/ns/org#resultedFrom", @@ -120,6 +126,59 @@ "http://data.lblod.info/vocabularies/erediensten/functie" ] }, + { + "type": "http://www.w3.org/ns/org#Site", + "graphsFilter": [ + "http://mu.semte.ch/graphs/shared", + "http://mu.semte.ch/graphs/worship-service", + "http://mu.semte.ch/graphs/administrative-unit" + ], + "properties": [ + "http://mu.semte.ch/vocabularies/core/uuid", + "http://www.w3.org/ns/org#siteAddress", + "https://data.vlaanderen.be/ns/organisatie#bestaatUit", + "http://data.lblod.info/vocabularies/erediensten/vestigingstype" + ] + }, + { + "type": "http://www.w3.org/ns/locn#Address", + "graphsFilter": [ + "http://mu.semte.ch/graphs/shared", + "http://mu.semte.ch/graphs/worship-service", + "http://mu.semte.ch/graphs/administrative-unit" + ], + "properties": [ + "http://mu.semte.ch/vocabularies/core/uuid", + "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer", + "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.busnummer", + "http://www.w3.org/ns/locn#thoroughfare", + "http://www.w3.org/ns/locn#postCode", + "https://data.vlaanderen.be/ns/adres#gemeentenaam", + "http://www.w3.org/ns/locn#adminUnitL2", + "https://data.vlaanderen.be/ns/adres#land", + "http://www.w3.org/ns/locn#fullAddress", + "https://data.vlaanderen.be/ns/adres#verwijstNaar", + "http://purl.org/dc/terms/source" + ] + }, + { + "type": "http://schema.org/ContactPoint", + "graphsFilter": [ + "http://mu.semte.ch/graphs/shared", + "http://mu.semte.ch/graphs/worship-service", + "http://mu.semte.ch/graphs/administrative-unit" + ], + "properties": [ + "http://mu.semte.ch/vocabularies/core/uuid", + "http://www.w3.org/ns/locn#address", + "http://xmlns.com/foaf/0.1/page", + "http://schema.org/faxNumber", + "http://schema.org/contactType", + "http://xmlns.com/foaf/0.1/page", + "http://schema.org/email", + "http://schema.org/telephone" + ] + }, { "type": "http://www.w3.org/ns/adms#Identifier", "graphsFilter": [ From 23e7ee7ff28ee18f8d4348b81f9885a1e457fa29 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Fri, 29 Mar 2024 13:59:04 +0100 Subject: [PATCH 42/48] chore: Bump frontend to v1.23.0-1 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3b18f36..6ba35be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.23.0-0 + image: lblod/frontend-organization-portal:1.23.0-1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 954f72ef7e988b35fd13fd334554ec0c80ed1614 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Fri, 29 Mar 2024 16:00:01 +0100 Subject: [PATCH 43/48] Revert "Merge pull request #397 from lblod/fix/add-recognized-worship-types" This reverts commit 9ed2cfa0801c75956eaaeaca00f2d727da5a818b, reversing changes made to 37f071c065b2186f19e6cb49c64829d8e8b1219e. --- ...01-add-new-recognized-worship-types.sparql | 27 ------------------- ...missing-types-representative-bodies.sparql | 15 ----------- 2 files changed, 42 deletions(-) delete mode 100644 config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql delete mode 100644 config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql diff --git a/config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql b/config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql deleted file mode 100644 index 9799562..0000000 --- a/config/migrations/2024/20240318142001-add-new-recognized-worship-types.sparql +++ /dev/null @@ -1,27 +0,0 @@ -PREFIX code: -PREFIX skos: -PREFIX core: - -INSERT { - GRAPH { - a code:TypeEredienst ; - core:uuid "cbd4c767ea184b41bf51b65d406754d4" ; - skos:prefLabel "Niet-confessioneel" ; - skos:inScheme ; - skos:inScheme ; - skos:topConceptOf . - } -} - -; - -INSERT { - GRAPH { - a code:TypeEredienst ; - core:uuid "f076c85e72814278814776b038ac33f7" ; - skos:prefLabel "Boeddhistisch" ; - skos:inScheme ; - skos:inScheme ; - skos:topConceptOf . - } -} \ No newline at end of file diff --git a/config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql b/config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql deleted file mode 100644 index aaf2b79..0000000 --- a/config/migrations/2024/20240318144801-update-missing-types-representative-bodies.sparql +++ /dev/null @@ -1,15 +0,0 @@ -PREFIX ere: - -INSERT { - GRAPH { - a ere:RepresentatiefOrgaan ; - ere:typeEredienst - } -} -; -INSERT { - GRAPH { - a ere:RepresentatiefOrgaan ; - ere:typeEredienst - } -} \ No newline at end of file From 69fa0b5d8b3549fbb4c7766fd8520042bb2b4f1a Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Tue, 2 Apr 2024 09:43:35 +0200 Subject: [PATCH 44/48] chore: Bump frontend to v1.23.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6ba35be..666e7af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.23.0-1 + image: lblod/frontend-organization-portal:1.23.0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From c24f56c7cb968d14ceea6bf499b40fc4f454c9bc Mon Sep 17 00:00:00 2001 From: felix Date: Tue, 2 Apr 2024 10:01:10 +0200 Subject: [PATCH 45/48] bump + tweaked ingestion blobs to smaller amounts to make it more digestable for OP (+ search) --- docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5302b51..6acc140 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -597,7 +597,7 @@ services: # LOKET WORSHIP SENSITIVE CONSUMERS ################################################################################ worship-services-sensitive-consumer: - image: lblod/delta-consumer:0.0.17-rc.7 + image: lblod/delta-consumer:0.0.24 environment: DCR_SYNC_BASE_URL: "https://loket.lblod.info/" DCR_SERVICE_NAME: "worship-services-sensitive-consumer" @@ -608,7 +608,8 @@ services: DCR_DISABLE_INITIAL_SYNC: "true" BYPASS_MU_AUTH_FOR_EXPENSIVE_QUERIES: "true" DCR_SYNC_FILES_PATH: "/sync/worship-services-sensitive/files" - BATCH_SIZE: 1000 + BATCH_SIZE: 50 + SLEEP_BETWEEN_BATCHES: 10 DCR_KEEP_DELTA_FILES: "true" DCR_ENABLE_DELTA_CONTEXT: "true" DCR_LANDING_ZONE_DATABASE: "triplestore" From 0592e10a8c1e9fdc1850a87d99d697009688559d Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 25 Mar 2024 15:54:42 +0100 Subject: [PATCH 46/48] chore: bump mu-search version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 666e7af..448dbce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -662,7 +662,7 @@ services: # MU SEARCH ################################################################################ search: - image: semtech/mu-search:0.9.1 + image: semtech/mu-search:0.10.0-beta.5 links: - db:database restart: always From aa7ce23a85e5591842611b86315c3014d030b7de Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 29 Mar 2024 13:54:22 +0100 Subject: [PATCH 47/48] chore: bumped consumers to latest version --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 448dbce..4a6204a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -535,7 +535,7 @@ services: # LOKET MANDATARISSEN CONSUMERS ################################################################################ mandatarissen-consumer: - image: lblod/delta-consumer:0.0.17-rc.7 + image: lblod/delta-consumer:0.0.24 environment: DCR_SERVICE_NAME: "mandatarissen-consumer" DCR_SYNC_BASE_URL: "https://loket.lblod.info" # replace with link to Loket API @@ -566,7 +566,7 @@ services: # LOKET LEIDINGGEVENDEN CONSUMERS ################################################################################ leidinggevenden-consumer: - image: lblod/delta-consumer:0.0.18 + image: lblod/delta-consumer:0.0.24 environment: DCR_SERVICE_NAME: "leidinggevenden-consumer" DCR_SYNC_BASE_URL: "https://loket.lblod.info" # replace with link to Loket API @@ -597,7 +597,7 @@ services: # LOKET WORSHIP SENSITIVE CONSUMERS ################################################################################ worship-services-sensitive-consumer: - image: lblod/delta-consumer:0.0.17-rc.7 + image: lblod/delta-consumer:0.0.24 environment: DCR_SYNC_BASE_URL: "https://loket.lblod.info/" DCR_SERVICE_NAME: "worship-services-sensitive-consumer" From a966e25832b376d9583514ef7d825790adfc8fd8 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Thu, 4 Apr 2024 11:50:08 +0200 Subject: [PATCH 48/48] fix: Update adressenregister to use basisregisters adressen V2 API --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9f3f74b..eb8023f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -175,7 +175,7 @@ services: links: - db:database adressenregister: - image: lblod/adressenregister-fuzzy-search-service:0.7.0 + image: lblod/adressenregister-fuzzy-search-service:0.8.0 labels: - "logging=true" restart: always