Fix manuscript query, add source column

src/client/components/ResultTable.js

@@ -289,7 +289,10 @@ class ResultTable extends React.Component {
                     </TableCell>
                     <TableCell className={classes.withFilter}>
                       {this.ownerRenderer(row.owner)}
-                    </TableCell> 
+                    </TableCell>
+                    <TableCell className={classes.withFilter}>
+                      {this.objectListRenderer(row.source)}
+                    </TableCell>
                   </TableRow>
                 );
               })}

src/client/components/ResultTableHead.js

@@ -69,6 +69,11 @@ const columns = [
     property: 'owner',
     desc: 'Material description'
   },
+  {
+    label: 'Source',
+    property: 'source',
+    desc: 'Source description'
+  },
 ];
 
 

src/server/sparql/Datasets.js

@@ -20,7 +20,7 @@ module.exports = {
       PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
       PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
       PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-      PREFIX dc: <http://purl.org/dc/elements/1.1/>
+      PREFIX dct: <http://purl.org/dc/terms/>
       PREFIX frbroo: <http://erlangen-crm.org/efrbroo/>
       PREFIX crm: <http://www.cidoc-crm.org/cidoc-crm/>
       PREFIX wgs84: <http://www.w3.org/2003/01/geo/wgs84_pos#>
@@ -31,8 +31,8 @@ module.exports = {
       SELECT (COUNT(DISTINCT ?id) as ?count)
       WHERE {
         <FILTER>
-
-        ?id a frbroo:F4_Manifestation_Singleton .
+        ?id a  frbroo:F4_Manifestation_Singleton .
+        #?id dct:source mmm-schema:Bodley .
       }
       `,
     'manuscriptQuery': `
@@ -54,6 +54,7 @@ module.exports = {
           SELECT DISTINCT ?id {
             <FILTER>
             ?id a frbroo:F4_Manifestation_Singleton .
+            #?id dct:source mmm-schema:Bodley .
             #?id ^<http://erlangen-crm.org/efrbroo/R18_created>/<http://www.cidoc-crm.org/cidoc-crm/P7_took_place_at> ?orderBy .
           }
           ORDER BY ?id
@@ -63,22 +64,25 @@ module.exports = {
         FILTER(BOUND(?id))
         ?id skos:prefLabel ?prefLabel .
         ?id mmm-schema:data_provider_url ?dataProviderUrl .
-        ?id dct:source ?source .
+        ?id dct:source ?source__id .
+        ?source__id skos:prefLabel ?source__prefLabel .
         {
           ?id crm:P51_has_former_or_current_owner ?owner__id .
           ?owner__id skos:prefLabel ?owner__prefLabel .
           ?owner__id mmm-schema:data_provider_url ?owner__dataProviderUrl .
-          [] rdf:subject ?id ;
+          OPTIONAL {
+            [] rdf:subject ?id ;
              rdf:predicate crm:P51_has_former_or_current_owner ;
              rdf:object ?owner__id ;
              mmm-schema:order ?order .
           BIND(xsd:integer(?order) + 1 AS ?owner__order)
+          }
         }
         UNION
         {
           ?expression_creation frbroo:R18_created ?id .
           ?expression_creation mmm-schema:carried_out_by_as_author ?author__id .
-          ?author__id skos:prefLabel ?author__prefLabel
+          ?author__id skos:prefLabel ?author__prefLabel .
           ?author__id mmm-schema:data_provider_url ?author__dataProviderUrl .
         }
         UNION

src/server/sparql/Manuscripts.js

@@ -44,7 +44,7 @@ const getManuscriptData = (page, pagesize, filters) => {
     manuscriptQuery = manuscriptQuery.replace('<FILTER>', generateResultFilter(filters));
   }
   manuscriptQuery = manuscriptQuery.replace('<PAGE>', `LIMIT ${pagesize} OFFSET ${page * pagesize}`);
-  // console.log(manuscriptQuery)
+  //console.log(manuscriptQuery)
   return sparqlSearchEngine.doSearch(manuscriptQuery, endpoint, makeObjectList);
 };
 
@@ -89,7 +89,6 @@ const getFacet = (facetConfig, filters) => {
     facetQuery = facetQuery.replace('<FILTER>', generateFacetFilter(facetConfig, filters));
   }
   facetQuery = facetQuery.replace('<PREDICATE>', facetConfig.predicate);
-  console.log(filters)
   let mapper = facetConfig.hierarchical ? mapHierarchicalFacet : mapFacet;
   return sparqlSearchEngine.doSearch(facetQuery, endpoint, mapper);
 };