Parameterize fetchByURI

src/client/actions/index.js

@@ -50,9 +50,9 @@ export const updatePage = (resultClass, page) => ({
   type: UPDATE_PAGE,
   resultClass, page
 });
-export const fetchByURI = (resultClass, facetClass, uri) => ({
+export const fetchByURI = (resultClass, facetClass, variant, uri) => ({
   type: FETCH_BY_URI,
-  resultClass, facetClass, uri
+  resultClass, facetClass, variant, uri
 });
 export const fetchByURIFailed = (resultClass, error, message) => ({
   type: FETCH_RESULTS_FAILED,

src/client/components/LeafletMap.js

@@ -289,13 +289,13 @@ class LeafletMap extends React.Component {
   }
 
   markerOnClick = event => {
-    this.props.fetchByURI(this.props.resultClass, this.props.facetClass, event.target.options.id,);
+    this.props.fetchByURI(this.props.resultClass, this.props.facetClass, this.props.variant, event.target.options.id,);
   };
 
   createPopUpContent(result) {
-    let popUpTemplate = `<h3>${result.prefLabel}</h3>`;
+    let popUpTemplate = `<a target="_blank" rel="noopener noreferrer" href=${result.id}><h3>${result.prefLabel}</h3></a>`;
     if (has(result, 'dataProviderUrl')) {
-      popUpTemplate += `<p>Data provider: <a target="_blank" rel="noopener noreferrer" href=${result.dataProviderUrl}>${result.dataProviderUrl}</a></p>`;
+      popUpTemplate += `<p>Data provider url: <a target="_blank" rel="noopener noreferrer" href=${result.dataProviderUrl}>${result.dataProviderUrl}</a></p>`;
     }
     if (has(result, 'sameAs')) {
       popUpTemplate += `<p>Place authority: <a target="_blank" rel="noopener noreferrer" href=${result.sameAs}>${result.sameAs}</a></p>`;

src/client/components/Main.js

@@ -146,7 +146,7 @@ let Main = props => {
                     People
                   </Typography>
                   <Typography component="p">
-                    People related to manuscripts.
+                    People related to manuscripts and works.
                   </Typography>
                 </CardContent>
               </CardActionArea>
@@ -186,7 +186,7 @@ let Main = props => {
                     Places
                   </Typography>
                   <Typography component="p">
-                    Places related to manuscripts.
+                    Places related to manuscripts and works.
                   </Typography>
                 </CardContent>
               </CardActionArea>

src/client/epics/index.js

@@ -75,8 +75,8 @@ const fetchByURIEpic = (action$, state$) => action$.pipe(
   ofType(FETCH_BY_URI),
   withLatestFrom(state$),
   mergeMap(([action, state]) => {
-    const { resultClass, facetClass, uri } = action;
-    const params = stateSlicesToUrl(null, state[`${facetClass}Facets`], null, null);
+    const { resultClass, facetClass, variant, uri } = action;
+    const params = stateSlicesToUrl(null, state[`${facetClass}Facets`], variant, facetClass);
     const requestUrl = `${apiUrl}${resultClass}/instance/${encodeURIComponent(uri)}?${params}`;
     return ajax.getJSON(requestUrl).pipe(
       map(response => updateInstance({ resultClass: resultClass, instance: response })),

src/server/index.js

 import express from 'express';
 import path from 'path';
 import bodyParser from 'body-parser';
-import { getPaginatedResults, getAllResults, getPlace } from './sparql/FacetResults';
+import { getPaginatedResults, getAllResults, getByURI } from './sparql/FacetResults';
 import { getFacet } from './sparql/Facets';
 const DEFAULT_PORT = 3001;
 const app = express();
@@ -34,7 +34,8 @@ app.get(`${apiPath}/:resultClass/paginated`, (req, res, next) => {
 app.get(`${apiPath}/:resultClass/all`, (req, res, next) => {
   const filters = req.query.filters == null ? null : JSON.parse(req.query.filters);
   const variant = req.query.variant || null;
-  return getAllResults(req.params.resultClass, req.query.facetClass, variant, filters).then(data => {
+  const facetClass = req.query.facetClass || null;
+  return getAllResults(req.params.resultClass, facetClass, variant, filters).then(data => {
     //console.log(data)
     res.json({
       resultCount: data.count,
@@ -45,16 +46,9 @@ app.get(`${apiPath}/:resultClass/all`, (req, res, next) => {
 
 app.get(`${apiPath}/:resultClass/instance/:uri`, (req, res, next) => {
   const filters = req.query.filters == null ? null : JSON.parse(req.query.filters);
-  let getByURI = null;
-  switch (req.params.resultClass) {
-    // case 'manuscripts':
-    //   getByURI = getManuscript;
-    //   break;
-    case 'places':
-      getByURI = getPlace;
-      break;
-  }
-  return getByURI(filters, req.params.uri).then(data => {
+  const variant = req.query.variant || null;
+  const facetClass = req.query.facetClass || null;
+  return getByURI(req.params.resultClass, facetClass, variant, filters, req.params.uri).then(data => {
     res.json(data[0]);
   }).catch(next);
 });

src/server/sparql/FacetResults.js

@@ -91,13 +91,27 @@ const getPaginatedData = (resultClass, page, pagesize, filters, sortBy, sortDire
   return sparqlSearchEngine.doSearch(prefixes + q, endpoint, makeObjectList);
 };
 
-export const getPlace = (filters, uri) => {
-  let q = placeQuery;
-  q = q.replace('<PLACE_ID>', `<${uri}>`);
-  if (filters == null) {
-    q = q.replace('<FILTER>', '# no filters');
+export const getByURI = (resultClass, facetClass, variant, filters, uri) => {
+  let q;
+  switch (resultClass) {
+    case 'places':
+      q = placeQuery;
+      break;
+  }
+  if (variant === 'productionPlaces') {
+    const manuscriptsProduced =
+      `OPTIONAL {
+          ${generateFilter(resultClass, facetClass, filters, 'manuscript__id', null)}
+          ?manuscript__id ^crm:P108_has_produced/crm:P7_took_place_at ?id .
+          ?manuscript__id mmm-schema:data_provider_url ?manuscript__dataProviderUrl .
+        }`;
+    q = q.replace('<MANUSCRIPTS>', manuscriptsProduced);
   } else {
-    q = q.replace('<FILTER>', generateFilter('places', 'manuscripts', filters, 'manuscript__id', null));
+    q = q.replace('<MANUSCRIPTS>', '');
   }
+  q = q.replace('<ID>', `<${uri}>`);
+  // if (variant === 'productionPlaces') {
+  //   console.log(prefixes + q)
+  // }
   return sparqlSearchEngine.doSearch(prefixes + q, endpoint, makeObjectList);
 };

src/server/sparql/Facets.js

@@ -40,9 +40,12 @@ export const getFacet = (resultClass, facetID, sortBy, sortDirection, filters) =
               OPTIONAL { ?id skos:prefLabel ?prefLabel_ }
               BIND(COALESCE(STR(?prefLabel_), STR(?id)) AS ?prefLabel)
               OPTIONAL { ?id dct:source ?source }
-              OPTIONAL { ?id gvp:broaderPreferred ?parent_ }
+              OPTIONAL {
+                ?id gvp:broaderPreferred ?parent_
+                FILTER(?parent_ != <http://ldf.fi/mmm/places/tgn_7026519>)
+              }
               BIND(COALESCE(?parent_, '0') as ?parent)
-              FILTER(?id != <http://ldf.fi/mmm/places/tgn_7026519>)
+              #FILTER(?id != <http://ldf.fi/mmm/places/tgn_7026519>)  
             }
       `;
   }

src/server/sparql/SparqlQueriesPlaces.js

@@ -54,10 +54,9 @@ export const placeQuery =  `
       PREFIX crm: <http://www.cidoc-crm.org/cidoc-crm/>
       PREFIX mmm-schema: <http://ldf.fi/mmm/schema/>
       PREFIX gvp: <http://vocab.getty.edu/ontology#>
-
       SELECT ?id ?prefLabel ?sameAs ?dataProviderUrl ?parent__id ?parent__prefLabel ?manuscript__id ?manuscript__dataProviderUrl
       WHERE {
-        BIND (<PLACE_ID> AS ?id)
+        BIND (<ID> AS ?id)
         OPTIONAL { ?id skos:prefLabel ?prefLabel_ }
         BIND(COALESCE(?prefLabel_, ?id) AS ?prefLabel)
         OPTIONAL {
@@ -66,10 +65,6 @@ export const placeQuery =  `
         }
         OPTIONAL { ?id mmm-schema:data_provider_url ?dataProviderUrl }
         OPTIONAL { ?id owl:sameAs ?sameAs }
-        OPTIONAL {
-          ?manuscript__id ^crm:P108_has_produced/crm:P7_took_place_at ?id .
-          ?manuscript__id mmm-schema:data_provider_url ?manuscript__dataProviderUrl .
-          <FILTER>
-        }
+        <MANUSCRIPTS>
       }
 `;