diff --git a/config/migrations/2023/20230627110500-add-missing-country.sparql b/config/migrations/2023/20230627110500-add-missing-country.sparql new file mode 100644 index 0000000..1fa5962 --- /dev/null +++ b/config/migrations/2023/20230627110500-add-missing-country.sparql @@ -0,0 +1,51 @@ +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: + +INSERT { + GRAPH ?g { + adres:land "Frankrijk" . + } +} WHERE { + GRAPH ?g { + ?p ?o. + } +}; + +INSERT { + GRAPH ?g { + ?address adres:land "België" . + } +} WHERE { + GRAPH ?g { + ?address + a locn:Address . + FILTER NOT EXISTS { + ?address + adres:land ?land . + } + } +}; \ No newline at end of file diff --git a/config/migrations/2023/20230627111000-add-country-to-full-address.sparql b/config/migrations/2023/20230627111000-add-country-to-full-address.sparql new file mode 100644 index 0000000..86552ec --- /dev/null +++ b/config/migrations/2023/20230627111000-add-country-to-full-address.sparql @@ -0,0 +1,59 @@ +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: + +DELETE { + GRAPH ?g { + ?address locn:fullAddress ?fullAddress . + } +} WHERE { + GRAPH ?g { + ?address locn:fullAddress ?fullAddress . + } +}; + +INSERT { + GRAPH ?g { + ?address locn:fullAddress ?fullAddress . + } +} WHERE { + GRAPH ?g { + ?address + a locn:Address; + locn:thoroughfare ?straatnaam; + adres:Adresvoorstelling.huisnummer ?huisnummer; + locn:postCode ?postcode; + adres:gemeentenaam ?gemeentenaam; + adres:land ?land . + + OPTIONAL { + ?address adres:Adresvoorstelling.busnummer ?busnummer . + } + + BIND(IF(BOUND(?busnummer), CONCAT(?straatnaam, " ", ?huisnummer, " ", ?busnummer, ", ", ?postcode, " ", ?gemeentenaam, ", ", ?land), CONCAT(?straatnaam, " ", ?huisnummer, ", ", ?postcode, " ", ?gemeentenaam, ", ", ?land)) AS ?fullAddress) + } +}; + diff --git a/docker-compose.yml b/docker-compose.yml index 3fd2c50..4829b84 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.6.3 + image: lblod/adressenregister-fuzzy-search-service:0.7.0 labels: - "logging=true" restart: always