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

diff --git a/bibframe/triplestore.xml b/bibframe/triplestore.xml
index f59629e..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>
 
@@ -108,15 +107,11 @@
 
             <!-- Combined title index. There are so many ways titles can be expresses
             in Bibframe, this seems to cover most of what we have seen -->
-            <!-- TODO - See the anytitle in instance for a more flexible way -->
             <index type="bf.anytitle">
                 {
-                    ?thing bf:workTitle ?wt .
-                    { ?wt bf:titleValue %v FILTER(contains(%v, %s)) } UNION
-                    { ?wt bf:subtitle %v FILTER(contains(%v, %s)) } UNION
-                    { ?wt bf:partTitle %v FILTER(contains(%v, %s)) }
-                } UNION {
-                    ?thing ?titlerel ?ti . <!-- any kind of link -->
+                    ?thing bf:title %v FILTER(contains(%v, %s))
+                } UNION { <!-- any kind of link -->
+                    ?thing ?titlerel ?ti . <!-- mostly workTitle, but others too -->
                     ?ti a bf:Title <!-- to something that is a title -->
                     {
                         ?ti bf:titleValue %v FILTER(contains(%v, %s))
@@ -130,7 +125,6 @@
                     ?inst bf:instanceTitle ?it .
                     ?it bf:titleValue %v FILTER(contains(%v, %s))
                 } UNION {
-                    ?thing bf:title %v FILTER(contains(%v, %s))
                 }
             </index>
 
@@ -166,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 .
@@ -181,30 +175,27 @@
                     %u ?rel ?wobj1 .
 
                     OPTIONAL {
-                        ?wobj ?wrel1 ?wobj1
-                        MINUS { ?wobj a bf:Work }
-                        MINUS { ?wobj a bf:Instance }
-                        OPTIONAL {
-                            ?wobj1 ?wrel2 ?wobj2
+                        ?wobj1 ?wrel2 ?wobj2
                             MINUS { ?wobj1 a bf:Work }
                             MINUS { ?wobj1 a bf:Instance }
-                            OPTIONAL {
-                                ?wobj2 ?wrel3 ?wobj3
+                        OPTIONAL {
+                            ?wobj2 ?wrel3 ?wobj3
                                 MINUS { ?wobj2 a bf:Work }
                                 MINUS { ?wobj2 a bf:Instance }
-                            }
                         }
                     }
                     <!-- Link to the instance(s) -->
                     OPTIONAL {
-                        ?inst bf:instanceOf %u
-                        OPTIONAL { <!-- and expand the instance -->
-                            ?inst ?irel1 ?iobj1
+                        ?inst bf:instanceOf %u .
+                        ?inst ?irel1 ?iobj1
+                        OPTIONAL {
+                            ?iobj1 ?irel2 ?iobj2
+                                MINUS { ?iobj1 a bf:Work }
+                                MINUS { ?iobj1 a bf:Instance }
                             OPTIONAL {
-                                ?iobj1 ?irel2 ?iobj2
-                                OPTIONAL {
-                                    ?iobj2 ?irel3 ?iobj3
-                                }
+                                ?iobj2 ?irel3 ?iobj3
+                                    MINUS { ?iobj2 a bf:Work }
+                                    MINUS { ?iobj2 a bf:Instance }
                             }
                         }
                     }
@@ -319,9 +310,9 @@
                 }
             </index>
 
-            <!-- Presetn formats. BF-L comes from "thing" -->
+            <!-- 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 .
@@ -332,33 +323,28 @@
                 }
                 WHERE {
                     %u a bf:Instance .
-                    %u ?irel1 ?iobj1
+                    %u ?irel1 ?iobj1 .
                     OPTIONAL {
                         ?iobj1 ?irel2 ?iobj2
-                        MINUS { ?iobj1 a bf:Work }
-                        MINUS { ?iobj1 a bf:Instance }
+                            MINUS { ?iobj2 a bf:Work }
+                            MINUS { ?iobj2 a bf:Instance } .
                         OPTIONAL {
                             ?iobj2 ?irel3 ?iobj3
-                            MINUS { ?iobj2 a bf:Work }
-                            MINUS { ?iobj2 a bf:Instance }
+                                MINUS { ?iobj3 a bf:Work }
+                                MINUS { ?iobj3 a bf:Instance }
                         }
                     }
-
-                    OPTIONAL {
-                        %u bf:instanceOf ?work
+                    OPTIONAL { <!-- Work -->
+                        %u bf:instanceOf ?work .
+                        ?work ?wrel1 ?wobj1 .
                         OPTIONAL {
-                            ?work ?wrel1 ?wobj1
-                            MINUS { ?wobj1 a bf:Work }
-                            MINUS { ?wobj1 a bf:Instance }
+                            ?wobj1 ?wrel2 ?wobj2
+                                MINUS { ?wobj1 a bf:Work }
+                                MINUS { ?wobj1 a bf:Instance } .
                             OPTIONAL {
-                                ?wobj1 ?wrel2 ?wobj2
-                                MINUS { ?wobj2 a bf:Work }
-                                MINUS { ?wobj2 a bf:Instance }
-                                OPTIONAL {
-                                    ?wobj2 ?wrel3 ?wobj3
-                                    MINUS { ?wobj3 a bf:Work }
-                                    MINUS { ?wobj3 a bf:Instance }
-                                }
+                                ?wobj2 ?wrel3 ?wobj3
+                                    MINUS { ?wobj2 a bf:Work }
+                                    MINUS { ?wobj2 a bf:Instance }
                             }
                         }
                     }
@@ -377,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 {