From e61f606def7e6c5ed5d90d95d665d5447c730293 Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Fri, 6 Jan 2023 11:32:27 +0100 Subject: [PATCH 1/3] Add delta producer for posts --- .../dump-file-publisher/config.json | 12 ++++ config/delta-producer/posts/export.json | 49 +++++++++++++++ config/delta/rules.js | 35 +++++++++++ docker-compose.dev.yml | 4 ++ docker-compose.yml | 62 +++++++++++++++++++ 5 files changed, 162 insertions(+) create mode 100644 config/delta-producer/posts/export.json diff --git a/config/delta-producer/dump-file-publisher/config.json b/config/delta-producer/dump-file-publisher/config.json index 5f0fd27..7456a19 100644 --- a/config/delta-producer/dump-file-publisher/config.json +++ b/config/delta-producer/dump-file-publisher/config.json @@ -34,5 +34,17 @@ "targetGraph": "http://redpencil.data.gift/id/deltas/producer/public", "fileBaseName": "dump-public", "compression": false + }, + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/posts" : { + "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/PostsCacheGraphDump", + "targetGraph": "http://redpencil.data.gift/id/deltas/producer/posts", + "fileBaseName": "dump-posts", + "compression": false + }, + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" : { + "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/PostsCacheGraphDump", + "targetGraph": "http://redpencil.data.gift/id/deltas/producer/posts", + "fileBaseName": "dump-posts", + "compression": false } } diff --git a/config/delta-producer/posts/export.json b/config/delta-producer/posts/export.json new file mode 100644 index 0000000..df6a82a --- /dev/null +++ b/config/delta-producer/posts/export.json @@ -0,0 +1,49 @@ +{ + "export": [ + { + "type": "http://data.vlaanderen.be/ns/mandaat#Mandaat", + "graphsFilter": [ + "http://mu.semte.ch/graphs/organisatieportaal" + ], + "properties": [ + "http://mu.semte.ch/vocabularies/core/uuid", + "http://www.w3.org/ns/org#role", + "http://www.w3.org/ns/org#postIn", + "http://www.w3.org/ns/org#role" + ] + }, + { + "type": "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", + "strictTypeExport": "true", + "graphsFilter": [ + "http://mu.semte.ch/graphs/organisatieportaal" + ], + "properties": [ + "http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor" + ] + }, + { + "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan", + "strictTypeExport": "true", + "graphsFilter": [ + "http://mu.semte.ch/graphs/organisatieportaal" + ], + "properties": [ + "http://www.w3.org/ns/org#hasPost" + ] + }, + { + "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar", + "graphsFilter": [ + "http://mu.semte.ch/graphs/organisatieportaal" + ], + "properties": [ + "http://mu.semte.ch/vocabularies/core/uuid", + "http://www.w3.org/ns/org#role", + "http://www.w3.org/ns/org#postIn", + "http://data.lblod.info/vocabularies/erediensten/functie", + "http://data.lblod.info/vocabularies/erediensten/behoort" + ] + } + ] +} diff --git a/config/delta/rules.js b/config/delta/rules.js index 15a2309..5fad7c0 100644 --- a/config/delta/rules.js +++ b/config/delta/rules.js @@ -156,6 +156,41 @@ export default [ optOutMuScopeIds: [ "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync" ] } }, + { + match: { + }, + callback: { + url: 'http://delta-producer-pub-graph-maintainer-posts/delta', + method: 'POST' + }, + options: { + resourceFormat: 'v0.0.1', + gracePeriod: 1000, + ignoreFromSelf: true, + optOutMuScopeIds: [ + "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync", + "http://redpencil.data.gift/id/concept/muScope/deltas/publicationGraphMaintenance" + ] + } + }, + { + match: { + graph: { + type: 'uri', + value: 'http://redpencil.data.gift/id/deltas/producer/posts' + } + }, + callback: { + url: 'http://delta-producer-json-diff-publisher-posts/delta', + method: 'POST' + }, + options: { + resourceFormat: 'v0.0.1', + gracePeriod: 1000, + ignoreFromSelf: true, + optOutMuScopeIds: [ "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync" ] + } + }, { match: { predicate: { diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 33d98bd..8066f8a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -71,3 +71,7 @@ services: restart: "no" construct-administrative-unit-relationships: restart: "no" + delta-producer-bg-jobs-initiator-posts: + restart: "no" + delta-producer-pub-graph-maintainer-posts: + restart: "no" diff --git a/docker-compose.yml b/docker-compose.yml index 62232c0..c2b4c5e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -404,6 +404,68 @@ services: # DELTA PUBLIC INFORMATION: END ################################################################################ + ################################################################################ + # DELTA POSTS: START + ################################################################################ + delta-producer-bg-jobs-initiator-posts: + image: lblod/delta-producer-background-jobs-initiator:0.3.1 + environment: + JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" + DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/posts" + INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" + HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/posts" + CRON_PATTERN_DUMP_JOB: "17 */4 * * *" # At minute 17 every 4 hours + CRON_PATTERN_HEALING_JOB: "0 0 3 * * *" # everyday at 3 AM + START_INITIAL_SYNC: "false" # prefer to disable it now. We want to have feeling with how the DB acts. + labels: + - "logging=true" + links: + - db:database + restart: always + logging: *default-logging + delta-producer-pub-graph-maintainer-posts: + image: lblod/delta-producer-publication-graph-maintainer:0.15.1 + environment: + MAX_BODY_SIZE: "50mb" + JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" + RELATIVE_FILE_PATH: "deltas/public" + PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/posts" + HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/posts" + INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" + QUEUE_POLL_INTERVAL: 3000 + USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive + SKIP_MU_AUTH_INITIAL_SYNC: "true" + HEALING_PATCH_GRAPH_BATCH_SIZE: 500 + volumes: + - ./config/delta-producer/posts:/config + - ./data/files/:/share + links: + - db:database + - triplestore:virtuoso + restart: always + logging: *default-logging + delta-producer-json-diff-publisher-posts: + image: lblod/delta-producer-json-diff-file-publisher:0.2.3 + environment: + MAX_BODY_SIZE: "50mb" + ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" + RELATIVE_FILE_PATH: "deltas/posts" + PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/posts" + PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/posts" + DELTA_INTERVAL_MS: 10000 + PRETTY_PRINT_DIFF_JSON: "true" + volumes: + - ./data/files:/share + labels: + - "logging=true" + links: + - db:database + restart: always + logging: *default-logging + ################################################################################ + # DELTA POSTS: END + ################################################################################ + ################################################################################ # DELTA CONSUMERS ################################################################################ From dbb9c06dd7f995b119d59f8fbe2aa27016fa818b Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Fri, 6 Jan 2023 12:48:59 +0100 Subject: [PATCH 2/3] Limit producer to worship posts --- .../dump-file-publisher/config.json | 16 +++++----- .../{posts => worship-posts}/export.json | 12 +++---- config/delta/rules.js | 6 ++-- docker-compose.dev.yml | 4 +-- docker-compose.yml | 32 +++++++++---------- 5 files changed, 34 insertions(+), 36 deletions(-) rename config/delta-producer/{posts => worship-posts}/export.json (61%) diff --git a/config/delta-producer/dump-file-publisher/config.json b/config/delta-producer/dump-file-publisher/config.json index 7456a19..b4d972e 100644 --- a/config/delta-producer/dump-file-publisher/config.json +++ b/config/delta-producer/dump-file-publisher/config.json @@ -35,16 +35,16 @@ "fileBaseName": "dump-public", "compression": false }, - "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/posts" : { - "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/PostsCacheGraphDump", - "targetGraph": "http://redpencil.data.gift/id/deltas/producer/posts", - "fileBaseName": "dump-posts", + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/worship-posts" : { + "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/WorshipPostsCacheGraphDump", + "targetGraph": "http://redpencil.data.gift/id/deltas/producer/worship-posts", + "fileBaseName": "dump-worship-posts", "compression": false }, - "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" : { - "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/PostsCacheGraphDump", - "targetGraph": "http://redpencil.data.gift/id/deltas/producer/posts", - "fileBaseName": "dump-posts", + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts" : { + "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/WorshipPostsCacheGraphDump", + "targetGraph": "http://redpencil.data.gift/id/deltas/producer/worship-posts", + "fileBaseName": "dump-worship-posts", "compression": false } } diff --git a/config/delta-producer/posts/export.json b/config/delta-producer/worship-posts/export.json similarity index 61% rename from config/delta-producer/posts/export.json rename to config/delta-producer/worship-posts/export.json index df6a82a..9c4b9ad 100644 --- a/config/delta-producer/posts/export.json +++ b/config/delta-producer/worship-posts/export.json @@ -7,10 +7,9 @@ ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", - "http://www.w3.org/ns/org#role", - "http://www.w3.org/ns/org#postIn", "http://www.w3.org/ns/org#role" - ] + ], + "additionalFilter": "?orgaan ?subject ; / ?bestuurseenheid . ?bestuurseenheid a ?type. FILTER (?type IN (, ))" }, { "type": "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", @@ -30,7 +29,8 @@ ], "properties": [ "http://www.w3.org/ns/org#hasPost" - ] + ], + "additionalFilter": "?subject / ?bestuurseenheid . ?bestuurseenheid a ?type. FILTER (?type IN (, ))" }, { "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar", @@ -40,9 +40,7 @@ "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", "http://www.w3.org/ns/org#role", - "http://www.w3.org/ns/org#postIn", - "http://data.lblod.info/vocabularies/erediensten/functie", - "http://data.lblod.info/vocabularies/erediensten/behoort" + "http://data.lblod.info/vocabularies/erediensten/functie" ] } ] diff --git a/config/delta/rules.js b/config/delta/rules.js index 5fad7c0..0578070 100644 --- a/config/delta/rules.js +++ b/config/delta/rules.js @@ -160,7 +160,7 @@ export default [ match: { }, callback: { - url: 'http://delta-producer-pub-graph-maintainer-posts/delta', + url: 'http://delta-producer-pub-graph-maintainer-worship-posts/delta', method: 'POST' }, options: { @@ -177,11 +177,11 @@ export default [ match: { graph: { type: 'uri', - value: 'http://redpencil.data.gift/id/deltas/producer/posts' + value: 'http://redpencil.data.gift/id/deltas/producer/worship-posts' } }, callback: { - url: 'http://delta-producer-json-diff-publisher-posts/delta', + url: 'http://delta-producer-json-diff-publisher-worship-posts/delta', method: 'POST' }, options: { diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 8066f8a..5eecc28 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -71,7 +71,7 @@ services: restart: "no" construct-administrative-unit-relationships: restart: "no" - delta-producer-bg-jobs-initiator-posts: + delta-producer-bg-jobs-initiator-worship-posts: restart: "no" - delta-producer-pub-graph-maintainer-posts: + delta-producer-pub-graph-maintainer-worship-posts: restart: "no" diff --git a/docker-compose.yml b/docker-compose.yml index c2b4c5e..eaa277f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -405,15 +405,15 @@ services: ################################################################################ ################################################################################ - # DELTA POSTS: START + # DELTA WORSHIP POSTS: START ################################################################################ - delta-producer-bg-jobs-initiator-posts: + delta-producer-bg-jobs-initiator-worship-posts: image: lblod/delta-producer-background-jobs-initiator:0.3.1 environment: JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" - DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/posts" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/posts" + DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/worship-posts" + INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts" + HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts" CRON_PATTERN_DUMP_JOB: "17 */4 * * *" # At minute 17 every 4 hours CRON_PATTERN_HEALING_JOB: "0 0 3 * * *" # everyday at 3 AM START_INITIAL_SYNC: "false" # prefer to disable it now. We want to have feeling with how the DB acts. @@ -423,35 +423,35 @@ services: - db:database restart: always logging: *default-logging - delta-producer-pub-graph-maintainer-posts: + delta-producer-pub-graph-maintainer-worship-posts: image: lblod/delta-producer-publication-graph-maintainer:0.15.1 environment: MAX_BODY_SIZE: "50mb" JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" - RELATIVE_FILE_PATH: "deltas/public" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/posts" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/posts" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" + RELATIVE_FILE_PATH: "deltas/worship-posts" + PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/worship-posts" + HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts" + INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts" QUEUE_POLL_INTERVAL: 3000 USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive SKIP_MU_AUTH_INITIAL_SYNC: "true" HEALING_PATCH_GRAPH_BATCH_SIZE: 500 volumes: - - ./config/delta-producer/posts:/config + - ./config/delta-producer/worship-posts:/config - ./data/files/:/share links: - db:database - triplestore:virtuoso restart: always logging: *default-logging - delta-producer-json-diff-publisher-posts: + delta-producer-json-diff-publisher-worship-posts: image: lblod/delta-producer-json-diff-file-publisher:0.2.3 environment: MAX_BODY_SIZE: "50mb" ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" - RELATIVE_FILE_PATH: "deltas/posts" - PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/posts" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/posts" + RELATIVE_FILE_PATH: "deltas/worship-posts" + PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/worship-posts" + PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/worship-posts" DELTA_INTERVAL_MS: 10000 PRETTY_PRINT_DIFF_JSON: "true" volumes: @@ -463,7 +463,7 @@ services: restart: always logging: *default-logging ################################################################################ - # DELTA POSTS: END + # DELTA WORSHIP POSTS: END ################################################################################ ################################################################################ From d61b7c6c4540136229d3b043a313f8774d0ab57a Mon Sep 17 00:00:00 2001 From: Nordine Bittich <3816305+nbittich@users.noreply.github.com> Date: Sun, 8 Jan 2023 10:15:17 +0100 Subject: [PATCH 3/3] fix missing persons & use standard mu search (#207) --- config/search/config.json | 34 ++++++++++---------- config/search/dev/config.json | 60 +++++++++++++++++------------------ docker-compose.yml | 4 +-- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/config/search/config.json b/config/search/config.json index bfb99e0..6649ae8 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -141,8 +141,8 @@ { "type": "mandatory", "on_path": "mandatories", - "rdf_type": "http://data.vlaanderen.be/ns/mandaat#Mandataris", - "sub_types": [ + "rdf_type": [ + "http://data.vlaanderen.be/ns/mandaat#Mandataris", "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris" ], "properties": { @@ -150,11 +150,11 @@ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/givenName" ], - "id": [ + "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "uuid": [ + "person_uuid": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], @@ -312,11 +312,11 @@ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/givenName" ], - "id": [ + "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "uuid": [ + "person_uuid": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], @@ -468,8 +468,8 @@ { "type": "minister", "on_path": "ministers", - "rdf_type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", - "sub_types": [ + "rdf_type": [ + "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" ], "properties": { @@ -477,11 +477,11 @@ "http://www.w3.org/ns/org#heldBy", "http://xmlns.com/foaf/0.1/givenName" ], - "id": [ + "person_id": [ "http://www.w3.org/ns/org#heldBy", "http://mu.semte.ch/vocabularies/core/uuid" ], - "uuid": [ + "person_uuid": [ "http://www.w3.org/ns/org#heldBy", "http://mu.semte.ch/vocabularies/core/uuid" ], @@ -546,7 +546,7 @@ } } }, - "id": { + "person_id": { "type": "text", "fields": { "field": { @@ -638,11 +638,11 @@ } }, { - "name": "id", + "name": "person_id", "mappings": { - "minister": "id", - "agent": "id", - "mandatory": "id" + "minister": "person_id", + "agent": "person_id", + "mandatory": "person_id" } }, { @@ -814,8 +814,8 @@ { "type": "unit", "on_path": "units", - "rdf_type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", - "sub_types": [ + "rdf_type": [ + "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst" diff --git a/config/search/dev/config.json b/config/search/dev/config.json index 97a230f..153ec14 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -1,7 +1,7 @@ { "automatic_index_updates": true, "persist_indexes": true, - "number_of_threads": 11, + "number_of_threads": 8, "eager_indexing_groups": [ [ { @@ -46,27 +46,27 @@ } ] ], - "default_settings" : { + "default_settings": { "analysis": { "normalizer": { "custom_sort_normalizer": { - "type": "custom", - "char_filter": [], - "filter": [ - "lowercase", - "trim", - "asciifolding" - ] + "type": "custom", + "char_filter": [], + "filter": [ + "lowercase", + "trim", + "asciifolding" + ] } - } + } } }, "types": [ { "type": "mandatory", "on_path": "mandatories", - "rdf_type": "http://data.vlaanderen.be/ns/mandaat#Mandataris", - "sub_types": [ + "rdf_type": [ + "http://data.vlaanderen.be/ns/mandaat#Mandataris", "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris" ], "properties": { @@ -74,11 +74,11 @@ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/givenName" ], - "id": [ + "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "uuid": [ + "person_uuid": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], @@ -153,7 +153,7 @@ } } }, - "id": { + "person_id": { "type": "text", "fields": { "field": { @@ -236,11 +236,11 @@ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/givenName" ], - "id": [ + "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "uuid": [ + "person_uuid": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], @@ -315,7 +315,7 @@ } } }, - "id": { + "person_id": { "type": "text", "fields": { "field": { @@ -392,8 +392,8 @@ { "type": "minister", "on_path": "ministers", - "rdf_type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", - "sub_types": [ + "rdf_type": [ + "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" ], "properties": { @@ -401,11 +401,11 @@ "http://www.w3.org/ns/org#heldBy", "http://xmlns.com/foaf/0.1/givenName" ], - "id": [ + "person_id": [ "http://www.w3.org/ns/org#heldBy", "http://mu.semte.ch/vocabularies/core/uuid" ], - "uuid": [ + "person_uuid": [ "http://www.w3.org/ns/org#heldBy", "http://mu.semte.ch/vocabularies/core/uuid" ], @@ -470,7 +470,7 @@ } } }, - "id": { + "person_id": { "type": "text", "fields": { "field": { @@ -562,11 +562,11 @@ } }, { - "name": "id", + "name": "person_id", "mappings": { - "minister": "id", - "agent": "id", - "mandatory": "id" + "minister": "person_id", + "agent": "person_id", + "mandatory": "person_id" } }, { @@ -661,7 +661,7 @@ } } }, - "id": { + "person_id": { "type": "text", "fields": { "field": { @@ -739,8 +739,8 @@ { "type": "unit", "on_path": "units", - "rdf_type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", - "sub_types": [ + "rdf_type": [ + "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst" diff --git a/docker-compose.yml b/docker-compose.yml index 62232c0..4a58160 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -466,10 +466,10 @@ services: ################################################################################ ################################################################################ - # MU SEARCH - TODO USE THE CORRECT IMAGE ONCE INHERITANCE IS IN MU SEARCH + # MU SEARCH ################################################################################ search: - image: nbittich/mu-search:wip-inheritance-alpha2 # Bump to fixed version when merged and release to the original repo + image: semtech/mu-search:0.9.0-beta.1 links: - db:database restart: always