From 26467b694d89d5d297097a41bf5d4543a78ccf18 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Mon, 17 Jun 2019 11:26:22 +0300
Subject: [PATCH] Places: add manuscript and actor column

---
 src/client/reducers/places.js            | 26 ++++++++++++++++++++++--
 src/server/sparql/SparqlQueriesPlaces.js | 19 +++++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/client/reducers/places.js b/src/client/reducers/places.js
index abd82677..db27f084 100644
--- a/src/client/reducers/places.js
+++ b/src/client/reducers/places.js
@@ -46,7 +46,8 @@ export const INITIAL_STATE = {
       valueType: 'object',
       makeLink: true,
       sortValues: true,
-      numberedList: false
+      numberedList: false,
+      minWidth: 170
     },
     {
       id: 'placeType',
@@ -55,7 +56,8 @@ export const INITIAL_STATE = {
       valueType: 'string',
       makeLink: false,
       sortValues: true,
-      numberedList: false
+      numberedList: false,
+      minWidth: 170
     },
     {
       id: 'area',
@@ -67,6 +69,26 @@ export const INITIAL_STATE = {
       numberedList: false,
       minWidth: 170
     },
+    {
+      id: 'actor',
+      label: 'Actor',
+      desc: 'Actor description',
+      valueType: 'object',
+      makeLink: true,
+      sortValues: true,
+      numberedList: false,
+      minWidth: 200
+    },
+    {
+      id: 'manuscript',
+      label: 'Manuscript',
+      desc: 'Manuscript description',
+      valueType: 'object',
+      makeLink: true,
+      sortValues: true,
+      numberedList: false,
+      minWidth: 170
+    },
     {
       id: 'source',
       label: 'Source',
diff --git a/src/server/sparql/SparqlQueriesPlaces.js b/src/server/sparql/SparqlQueriesPlaces.js
index e18eb2ec..b8e5a2fb 100644
--- a/src/server/sparql/SparqlQueriesPlaces.js
+++ b/src/server/sparql/SparqlQueriesPlaces.js
@@ -6,8 +6,7 @@ export const placeProperties = `
     }
     UNION
     {
-      ?id dct:source
-          |owl:sameAs
+      ?id  owl:sameAs
           |mmm-schema:data_provider_url
           |mmm-schema:geonames_uri
           ?source__id .
@@ -20,6 +19,22 @@ export const placeProperties = `
       ?id gvp:broaderPreferred ?area__id .
       ?area__id skos:prefLabel ?area__prefLabel .
     }
+    UNION {
+      ?id ^mmm-schema:person_place ?actor__id .
+      ?actor__id skos:prefLabel ?actor__prefLabel .
+      ?actor__id mmm-schema:data_provider_url ?actor__dataProviderUrl .
+    }
+    UNION {
+      ?id ^crm:P7_took_place_at/crm:P108_has_produced ?manuscript__id .
+      ?manuscript__id skos:prefLabel ?manuscript__prefLabel .
+      BIND(?manuscript__id AS ?manuscript__dataProviderUrl)
+    }
+    UNION {
+      ?id ^crm:P7_took_place_at/
+        (crm:P30_transferred_custody_of|mmm-schema:observed_manuscript) ?manuscript__id .
+      ?manuscript__id skos:prefLabel ?manuscript__prefLabel .
+      BIND(?manuscript__id AS ?manuscript__dataProviderUrl)
+    }
 `;
 
 export const allPlacesQuery =  `
-- 
GitLab