diff --git a/config/migrations/2022/202206131O4623-normalize-space.sparql b/config/migrations/2022/202206131O4623-normalize-space.sparql new file mode 100644 index 0000000..ca1b34d --- /dev/null +++ b/config/migrations/2022/202206131O4623-normalize-space.sparql @@ -0,0 +1,20 @@ +DELETE { + graph { + ?s ?p ?o. + } + +} +INSERT { + graph { + ?s ?p ?normalize. + } +} +WHERE { + graph { + ?s ?p ?o. + BIND(replace(?o, "\\s+|\\t", " ") AS ?single_space) + BIND(replace(?single_space, "^(\\s+)|(\\s+)$|(\\t)$|(\\t)", "") AS ?normalize) + + FILTER ( isLiteral(?o) && ( regex(?o, "\\s+|\\t") || regex(?o, "^(\\s+)|(\\s+)$|(\\t)$|(\\t)") ) ) + } +} \ No newline at end of file diff --git a/config/migrations/2022/20220620112423-remove-involvements.sparql b/config/migrations/2022/20220620112423-remove-involvements.sparql new file mode 100644 index 0000000..4a6e7a0 --- /dev/null +++ b/config/migrations/2022/20220620112423-remove-involvements.sparql @@ -0,0 +1,32 @@ + +# OP-1520 & OP-1529 - OP-1519 & OP-1518 + +prefix org: +prefix ere: +prefix skos: + +delete where { + +graph { + +?involvement a ere:BetrokkenLokaleBesturen; + org:organization ?worshipService; + ere:typebetrokkenheid ?typebetrokkenheid. + +?betrokkenBestuur ere:betrokkenBestuur ?involvement. +?involvement ?p ?o. + +filter (?typebetrokkenheid = && +(?worshipService = +|| ?worshipService = +|| ?worshipService = +|| ?worshipService = +|| ?worshipService = + + )) +} +} + + + + diff --git a/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql b/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql new file mode 100644 index 0000000..0a1454e --- /dev/null +++ b/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql @@ -0,0 +1,26 @@ + +# OP-1565 + +prefix skos: + +delete { + graph { + skos:prefLabel ?prefLabel1. + skos:prefLabel ?prefLabel2. + skos:prefLabel ?prefLabel3. + } + +}insert { + graph { + skos:prefLabel "Toezichthoudend". + skos:prefLabel "Mede-financierend". + skos:prefLabel "Adviserend". + } + +}where { + graph { + skos:prefLabel ?prefLabel1. + skos:prefLabel ?prefLabel2. + skos:prefLabel ?prefLabel3. + } +} \ No newline at end of file diff --git a/config/migrations/2022/20220719112423-update-toezicht.sparql b/config/migrations/2022/20220719112423-update-toezicht.sparql new file mode 100644 index 0000000..36ae9d7 --- /dev/null +++ b/config/migrations/2022/20220719112423-update-toezicht.sparql @@ -0,0 +1,69 @@ +PREFIX org: +PREFIX locn: +PREFIX schema: +PREFIX regorg: +PREFIX person: +PREFIX vcard: +PREFIX dbpedia: +PREFIX adms: +PREFIX euro: +PREFIX prov: +PREFIX organisatie: +PREFIX persoon: +PREFIX adres: +PREFIX generiek: +PREFIX mandaat: +PREFIX besluit: +PREFIX lblodlg: +PREFIX dc_terms: +PREFIX foaf: +PREFIX skos: +PREFIX euvoc: +PREFIX ere: +PREFIX ch: +PREFIX code: +PREFIX ext: +PREFIX rdfs: +PREFIX adres: + +DELETE { GRAPH { ?betrokkenheid ere:typebetrokkenheid . } } +INSERT { GRAPH { ?betrokkenheid ere:typebetrokkenheid . } } +WHERE { + GRAPH { + { + SELECT DISTINCT ?bestuur ?label ?typeEredienst ?provincie ?municipality ?betrokkenheidCount WHERE { + { + SELECT ?bestuur (COUNT(DISTINCT ?betrokkenheid) AS ?betrokkenheidCount) WHERE { + ?bestuur rdf:type ?type. + FILTER(?type IN(ere:CentraalBestuurVanDeEredienst, ere:BestuurVanDeEredienst)) + ?betrokkenheid org:organization ?bestuur; + ere:typebetrokkenheid ; + rdf:type ere:BetrokkenLokaleBesturen. + } + GROUP BY ?bestuur + HAVING ((COUNT(DISTINCT ?betrokkenheid)) > 1 ) + ORDER BY DESC (?betrokkenheidCount) + } + OPTIONAL { ?bestuur skos:prefLabel ?label. } + OPTIONAL { + ?bestuur ere:typeEredienst ?typeEredienstUri. + OPTIONAL { ?typeEredienstUri skos:prefLabel ?typeEredienst. } + } + OPTIONAL { + ?bestuur org:hasPrimarySite ?primarySite. + OPTIONAL { + ?primarySite organisatie:bestaatUit ?sa. + OPTIONAL { ?sa locn:adminUnitL2 ?provincie. } + OPTIONAL { ?sa adres:gemeentenaam ?municipality. } + } + } + } + } + ?betrokkenheid org:organization ?bestuur; + ere:typebetrokkenheid ; + rdf:type ere:BetrokkenLokaleBesturen. + ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid. + OPTIONAL { ?administrativeUnit skos:prefLabel ?administrativeUnitLabel. } + FILTER(?administrativeUnitLabel != ?municipality) + } +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ecb725f..a96f5e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.9.0-4 + image: lblod/frontend-organization-portal:1.10.0-2 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: