X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bibframe%2Ftriplestore.xml;h=633d9d512be8be8300bda7ffbd674a8dea0cf7a2;hb=60523b77c43ab3d9bc48215c21e4af112a705b2b;hp=25fab14cb9dd16072a19906a9f9b510b0b90e44c;hpb=f46a54721c067a4146453148774dfeb4c17a6a40;p=mp-sparql-moved-to-github.git

diff --git a/bibframe/triplestore.xml b/bibframe/triplestore.xml
index 25fab14..633d9d5 100644
--- a/bibframe/triplestore.xml
+++ b/bibframe/triplestore.xml
@@ -21,14 +21,13 @@
 
 
             <!-- The BF-L present format is the same for everything -->
-            <!-- Each db is supposed to provide a dedicated BF-F present format -->
+            <!-- Each db is supposed to provide a dedicated BF-V present format -->
             <present type="BF-L">
                 CONSTRUCT {
-                    ?thing ?rel ?subj
+                    %u ?rel ?subj
                 }
                 WHERE {
-                    ?thing ?rel ?subj .
-                    ?thing ?rel ?subj FILTER( str(?thing) = %s )
+                    %u ?rel ?subj .
                 }
             </present>
 
@@ -161,8 +160,8 @@
 
             <!-- Present formats -->
             <!-- BF-L comes from the "thing" template -->
-            <!-- BF-F expands all links, even to instances but not other works -->
-            <present type="BF-F">
+            <!-- BF-V expands all links, even to instances but not other works -->
+            <present type="BF-V">
                 CONSTRUCT {
                     %u ?rel ?wobj1 .
                     ?wobj1 ?wrel1 ?wobj2 .
@@ -313,7 +312,7 @@
 
             <!-- Present formats. BF-L comes from "thing" -->
             <!-- Full instance, with the related work too -->
-            <present type="BF-F">
+            <present type="BF-V">
                 CONSTRUCT {
                     %u ?irel1 ?iobj1 .
                     ?iobj1 ?irel2 ?iobj2 .
@@ -324,11 +323,11 @@
                 }
                 WHERE {
                     %u a bf:Instance .
-                    %u ?irel1 ?iobj1
+                    %u ?irel1 ?iobj1 .
                     OPTIONAL {
                         ?iobj1 ?irel2 ?iobj2
                             MINUS { ?iobj2 a bf:Work }
-                            MINUS { ?iobj2 a bf:Instance }
+                            MINUS { ?iobj2 a bf:Instance } .
                         OPTIONAL {
                             ?iobj2 ?irel3 ?iobj3
                                 MINUS { ?iobj3 a bf:Work }
@@ -336,12 +335,12 @@
                         }
                     }
                     OPTIONAL { <!-- Work -->
-                        %u bf:instanceOf ?work
-                        ?work ?wrel1 ?wobj1
+                        %u bf:instanceOf ?work .
+                        ?work ?wrel1 ?wobj1 .
                         OPTIONAL {
                             ?wobj1 ?wrel2 ?wobj2
                                 MINUS { ?wobj1 a bf:Work }
-                                MINUS { ?wobj1 a bf:Instance }
+                                MINUS { ?wobj1 a bf:Instance } .
                             OPTIONAL {
                                 ?wobj2 ?wrel3 ?wobj3
                                     MINUS { ?wobj2 a bf:Work }
@@ -364,7 +363,7 @@
         <!-- but have different "any" indexes -->
 
         <db path="smallbody" include="thing">
-            <present type="BF-F">
+            <present type="BF-V">
                 <!-- I don't think we need more than one level -->
                 <!--for these simple databases -->
                 CONSTRUCT {