Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mp-sparql

[mp-sparql-moved-to-github.git] / bibframe / triplestore.xml

diff --git a/bibframe/triplestore.xml b/bibframe/triplestore.xml
index f5fd644..f227102 100644 (file)
--- a/bibframe/triplestore.xml
+++ b/bibframe/triplestore.xml
@@ -1,14 +1,14 @@
 <filters  xmlns="http://indexdata.com/metaproxy">
   <filter type="sparql">
-    <defaults uri="http://bibframe.indexdata.com:21/sparql/"/>
+    <defaults uri="http://bibframe.indexdata.com/sparql/"/>
     <db path="work" schema="sparql-results">
       <prefix>rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns</prefix>
       <prefix>bf: http://bibframe.org/vocab/</prefix>
       <form>SELECT
               ?work
-              MAX(?wtitle) AS ?title
-              MAX(?creatorlabel) AS ?creator
-              MAX(?subjectlabel) AS ?subject
+              (sql:GROUP_DIGEST (?wtitle, ' ; ', 1000, 1)) AS ?title
+              (sql:GROUP_DIGEST (?creatorlabel, ' ; ', 1000, 1))AS ?creator
+              (sql:GROUP_DIGEST (?subjectlabel, ' ; ', 1000, 1))AS ?subject
       </form>
       <criteria>?work a bf:Work</criteria>
 
@@ -29,7 +29,7 @@
       <index type="21">?subject bf:label %v FILTER(contains(%v, %s))</index>
       <index type="1016"> {
             ?work ?op1 ?child .
-            ?child ?op2 ?val FILTER(contains(STR(?val), %s))
+            ?child ?op2 %v FILTER(contains(STR(%v), %s))
           }
       </index>
       <modifier>GROUP BY $work</modifier>
@@ -37,7 +37,12 @@
     <db path="works" schema="rdf">
       <prefix>rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns</prefix>
       <prefix>bf: http://bibframe.org/vocab/</prefix>
-      <form>CONSTRUCT {  ?work bf:title ?title . ?work bf:author ?creator . ?work bf:instanceTitle ?it }</form>
+      <form>CONSTRUCT { 
+          ?work bf:title ?wtitle . 
+          ?work bf:instanceTitle ?title .
+          ?work bf:author ?creator . 
+          ?work bf:subject ?subjectlabel }
+      </form>
       <criteria>?work a bf:Work</criteria>
 
       <criteria>?work bf:workTitle ?wt</criteria>
@@ -53,7 +58,7 @@
     <db path="instance" schema="sparql-results">
       <prefix>rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns</prefix>
       <prefix>bf: http://bibframe.org/vocab/</prefix>
-      <form>SELECT DISTINCT ?instance ?title ?format</form>
+      <form>SELECT ?instance ?title ?format</form>
       <criteria>?instance a bf:Instance</criteria>
 
       <criteria>?instance bf:title ?title</criteria>