X-Git-Url: http://git.indexdata.com/?p=mp-sparql-moved-to-github.git;a=blobdiff_plain;f=bibframe%2Ftriplestore.xml;h=12af0ddd0b5b860ba919f9966f80fa47ab7ac892;hp=28f34c00239200a902f7ef30f7cf5ebdcfcafbd2;hb=62b3dd7a591f31846e92bb74f4a99b436fae1f1f;hpb=c1df4c10492078db363fc4071d4c34b02e264905

diff --git a/bibframe/triplestore.xml b/bibframe/triplestore.xml
index 28f34c0..12af0dd 100644
--- a/bibframe/triplestore.xml
+++ b/bibframe/triplestore.xml
@@ -1,5 +1,38 @@
 <?xml version="1.0"?>
 
+<!-- 
+Mp-sparql example configuration
+
+This config file snippet is typically included from the main Metaproxy
+configuration. It sets up a simple chain that consists of the sparql 
+filter to translate the queries etc, and a http_client filter that is used
+to do the actual communication to the triple store.
+
+This config provides quite many databases, one for each major type of
+records. The most important are "work" and "instance". These have a great
+number of indexes.  There is a number of "small" databases like "person",
+"meeting" and "topic". These have one main index, named after the database
+name, for example "bf.person".  The "node" database can search for any node
+in the database, and "info" returns simple information about available
+databases.
+
+There are other databases defined in this file, but they are only used 
+internally, to be included in the real database definitions. All real,
+searchable databases have
+  schema="sparql-results"
+in the db tag, whereas those for include use only do not.
+
+All databases support the BF-L ("Link") schema, which returns the triples 
+of the nodes found in the database, without expanding anything. Most of them 
+also support BF-V ("Verbose") schema that expands those links to return a set
+of triples that is more or less self contained. A work, its instances, titles
+for all of them, authors, and their names, etc.
+
+
+
+
+-->
+
 <filters  xmlns="http://indexdata.com/metaproxy">
     <filter type="sparql">
 
@@ -17,18 +50,31 @@
 
             <!-- bf.uri is a simple way to get to a thing -->
             <index type="bf.uri">
-                ?thing  rdf:type ?any FILTER( ?thing  = %u ) </index>
+                ?thing  %v_rel %v_obj FILTER( ?thing  = %u )
+            </index>
+
+            <!-- bf.type is a simple way to search for types -->
+            <!-- for example, a bf.Work can also be bf:Text or bf:Audio -->
+            <index type="bf.type">
+                ?thing  a %t
+            </index>
+
+            <!-- Find all nodes that refer to the given uri -->
+            <!-- useful after finding uris in the "small" bases -->
+            <!-- direct references only -->
+            <index type="bf.ref">
+                ?thing %v_rel %u
+            </index>
 
 
             <!-- 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>
 
@@ -36,16 +82,48 @@
 
         <!-- "smallindex" db that will be included in work and instance -->
         <!-- It provides the small indexes like bf.person, bf.place, etc -->
+        <!-- These match a person, etc, no matter what the relation to that -->
+        <!-- is, as long as there is a direct link -->
+        <!-- The %v gets assigned a new variable name, like ?v0. -->
+        <!-- The %vx gets the same ?v0, with the x suffixed to it, by regular -->
+        <!-- This way, we use a different variable for each index clause, and -->
+        <!-- do not get into trouble if we have an AND between two of the same kind -->
         <db path="smallindex">
-            <!-- Indexes for persons, organizations, etc -->
-            <!-- The person (etc) may be in any relation to the thing, -->
-            <!-- subject, creator, etc, as long as there is a direct link -->
             <index type="bf.person">
-                ?thing ?rel ?person .
-                ?person a bf:Person .
-                ?person bf:label %v FILTER(contains(%v, %s))
+                ?thing ?rel %vx .
+                %vx a bf:Person .
+                %vx bf:label %v FILTER(contains(%v, %s))
+            </index>
+            <index type="bf.topic">
+                ?thing ?rel %vx .
+                %vx a bf:Topic .
+                %vx bf:label %v FILTER(contains(%v, %s))
+            </index>
+            <index type="bf.place">
+                ?thing ?rel %vx .
+                %vx a bf:Place .
+                %vx bf:label %v FILTER(contains(%v, %s))
+            </index>
+            <index type="bf.agent">
+                ?thing ?rel %vx .
+                %vx a bf:Agent .
+                %vx bf:label %v FILTER(contains(%v, %s))
+            </index>
+            <index type="bf.meeting">
+                ?thing ?rel %vx .
+                %vx a bf:Meeting .
+                %vx bf:label %v FILTER(contains(%v, %s))
+            </index>
+            <index type="bf.organization">
+                ?thing ?rel %vx .
+                %vx a bf:Organization .
+                %vx bf:label %v FILTER(contains(%v, %s))
+            </index>
+            <index type="bf.event">
+                ?thing ?rel %vx .
+                %vx a bf:Event .
+                %vx bf:label %v FILTER(contains(%v, %s))
             </index>
-            <!-- TODO - make many more like the person above -->
         </db>
 
         <!-- work database -->
@@ -67,8 +145,8 @@
             <!-- worktitle.titleValue seems to be the most common way to -->
             <!-- store the title of a work -->
             <index type="bf.worktitle">
-                ?thing bf:workTitle ?wt .
-                ?wt bf:titleValue %v FILTER(contains(%v, %s))
+                ?thing bf:workTitle %v_wt .
+                %v_wt bf:titleValue %v FILTER(contains(%v, %s))
             </index>
 
             <!-- Combining the two above, since users are not likely -->
@@ -76,75 +154,77 @@
             <!-- TODO is "maintitle" a good name for this? I made it up myself -->
             <index type="bf.maintitle">
                 {
-                    ?thing bf:workTitle ?wt .
-                    ?wt bf:titleValue %v FILTER(contains(%v, %s))
+                    ?thing bf:workTitle %v_wt .
+                    %v_wt bf:titleValue %v FILTER(contains(%v, %s))
                 } UNION {
                     ?thing bf:title %v FILTER(contains(%v, %s))
                 }
             </index>
 
             <!-- the worktitle can also contain a subtitle and a parttitle -->
-            <index type="bf.subtitle">?thing bf:workTitle ?wt .
-                ?wt bf:subtitle %v FILTER(contains(%v, %s))
+            <index type="bf.subtitle">
+                ?thing bf:workTitle %v_wt .
+                %v_wt bf:subtitle %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.parttitle">
-                ?thing bf:workTitle ?wt .
-                ?wt bf:partTitle %v FILTER(contains(%v, %s))
+                ?thing bf:workTitle %v_wt .
+                %v_wt bf:partTitle %v FILTER(contains(%v, %s))
             </index>
 
             <!-- work.titlevariation - this could also have sub- and partTitles -->
             <index type="bf.titlevariation">
-                ?thing bf:titleVariation ?tv .
-                ?tv bf:titleValue %v FILTER(contains(%v, %s))
+                ?thing bf:titleVariation %v_tv .
+                %v_tv bf:titleValue %v FILTER(contains(%v, %s))
             </index>
 
             <!-- Instance titles -->
             <index type="bf.instancetitle">
-                ?inst bf:instanceOf ?thing .
-                ?inst bf:instanceTitle ?it .
-                ?it bf:titleValue %v FILTER(contains(%v, %s))
+                %v_inst bf:instanceOf ?thing .
+                %v_inst bf:instanceTitle %v_tit .
+                %v_tit bf:titleValue %v FILTER(contains(%v, %s))
             </index>
 
             <!-- 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 bf:titleVariation ?tv .
-                    ?tv bf:titleValue %v FILTER(contains(%v, %s))
-                } UNION {
-                    ?inst bf:instanceOf ?thing .
-                    ?inst bf:instanceTitle ?it .
-                    ?it bf:titleValue %v FILTER(contains(%v, %s))
-                } UNION {
                     ?thing bf:title %v FILTER(contains(%v, %s))
+                } UNION { <!-- any kind of link -->
+                    ?thing ?titlerel %v_ti . <!-- mostly workTitle, but others too -->
+                    %v_ti a bf:Title <!-- to something that is a title -->
+                    {
+                        %v_ti bf:titleValue %v FILTER(contains(%v, %s))
+                    } UNION {
+                        %v_ti bf:partTitle %v FILTER(contains(%v, %s))
+                    } UNION {
+                        %v_ti bf:subtitle %v FILTER(contains(%v, %s))
+                    }
+                } UNION {
+                    %v_inst bf:instanceOf ?thing .
+                    %v_inst bf:instanceTitle %v_ti .
+                    %v_ti bf:titleValue %v FILTER(contains(%v, %s))
                 }
             </index>
 
             <!-- Author indexes. Much simpler than titles. -->
             <index type="bf.creator">
-                ?thing bf:creator ?c .
-                ?c bf:label %v FILTER(contains(%v, %s))
+                ?thing bf:creator %v_c .
+                %v_c bf:label %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.contributor">
-                ?thing bf:contributor ?c .
-                ?c bf:label %v FILTER(contains(%v, %s))
+                ?thing bf:contributor %v_c .
+                %v_c bf:label %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.anyauthor"> <!-- TODO - Is this a good name? -->
                 {
-                    ?thing bf:creator ?c .
-                    ?c bf:label %v FILTER(contains(%v, %s))
+                    ?thing bf:creator %v_c .
+                    %v_c bf:label %v FILTER(contains(%v, %s))
                 } UNION {
-                    ?thing bf:contributor ?c .
-                    ?c bf:label %v FILTER(contains(%v, %s))
+                    ?thing bf:contributor %v_c .
+                    %v_c bf:label %v FILTER(contains(%v, %s))
                 }
             </index>
 
@@ -152,89 +232,61 @@
             <!-- Note that these refer to anything with a bf:subject relation -->
             <!-- The actual item is likely to be something like topic person etc -->
             <index type="bf.subject">
-                ?thing bf:subject ?subject .
-                ?subject bf:label %v FILTER(contains(%v, %s))
+                ?thing bf:subject %v_su .
+                %v_su bf:label %v FILTER(contains(%v, %s))
+            </index>
+
+            <!-- contentCategory can be searched with complete URIs like -->
+            <!-- http://id.loc.gov/vocabulary/contentTypes/txt -->
+            <index type="bf.contentcategory">
+                ?thing bf:contentCategory %u
             </index>
 
+            <!-- Find the work that has a given Instance -->
+            <index type="bf.instance">
+                %v_inst bf:instanceOf ?thing FILTER ( %v_inst = %u)
+            </index>
 
             <!-- Present formats -->
             <!-- BF-L comes from the "thing" template -->
-            <!-- BF-F expands all links, except to instances and other works -->
-            <present type="BF-F">
-                CONSTRUCT {
-                    ?thing ?rel ?obj .
-                    ?obj ?rel1 ?obj1 .
-                    ?obj1 ?rel2 ?obj2 .
-                    ?obj2 ?rel3 ?obj3
-                }
-                WHERE {
-
-                    ?thing a bf:Work .
-                    ?thing ?rel ?obj .
-                    OPTIONAL {
-                        ?obj ?rel1 ?obj1
-                        MINUS { ?obj a bf:Work }
-                        MINUS { ?obj a bf:Instance }
-                    }
-                    OPTIONAL {
-                        ?obj1 ?rel2 ?obj2
-                        MINUS { ?obj1 a bf:Work }
-                        MINUS { ?obj1 a bf:Instance }
-                    }
-                    OPTIONAL {
-                        ?obj2 ?rel3 ?obj3
-                        MINUS { ?obj2 a bf:Work }
-                        MINUS { ?obj2 a bf:Instance }
-                    }
-                    ?thing ?rel ?obj FILTER( str(?thing) = %s )
-                    <!-- TODO Use the %u -->
-                    <!-- TODO Use the BF-FI as the BF-F -->
-                }
-            </present>
-
-            <!-- full, with instances. Experimental! -->
-            <present type="BF-FI">
+            <!-- BF-V expands all links, even to instances but not other works -->
+            <present type="BF-V">
                 CONSTRUCT {
-                    %u ?rel ?wobj1 .
-                    ?wobj1 ?wrel1 ?wobj2 .
-                    ?wobj2 ?wrel2 ?wobj3 .
+                    %u ?wrel1 ?wobj1 .
+                    ?wobj1 ?wrel2 ?wobj2 .
+                    ?wobj2 ?wrel3 ?wobj3 .
                     ?inst ?irel1 ?iobj1 .
                     ?iobj1 ?irel2 ?iobj2 .
                     ?iobj2 ?irel3 ?iobj3
                 }
                 WHERE {
                     %u a bf:Work .
-                    %u ?rel ?wobj1 .
+                    %u ?wrel1 ?wobj1 .
 
                     OPTIONAL {
-                        ?wobj ?wrel1 ?wobj1
-                        MINUS { ?wobj a bf:Work }
-                        MINUS { ?wobj a bf:Instance }
-                    }
-                    OPTIONAL {
                         ?wobj1 ?wrel2 ?wobj2
-                        MINUS { ?wobj1 a bf:Work }
-                        MINUS { ?wobj1 a bf:Instance }
-                    }
-                    OPTIONAL {
-                        ?wobj2 ?wrel3 ?wobj3
-                        MINUS { ?wobj2 a bf:Work }
-                        MINUS { ?wobj2 a bf:Instance }
+                            MINUS { ?wobj1 a bf:Work }
+                            MINUS { ?wobj1 a bf:Instance }
+                        OPTIONAL {
+                            ?wobj2 ?wrel3 ?wobj3
+                                MINUS { ?wobj2 a bf:Work }
+                                MINUS { ?wobj2 a bf:Instance }
+                        }
                     }
-
                     <!-- Link to the instance(s) -->
                     OPTIONAL {
-                        ?inst bf:instanceOf %u
-                    }
-                    <!-- and expand the instance -->
-                    OPTIONAL {
+                        ?inst bf:instanceOf %u .
                         ?inst ?irel1 ?iobj1
-                    }
-                    OPTIONAL {
-                        ?iobj1 ?irel2 ?iobj2
-                    }
-                    OPTIONAL {
-                        ?iobj2 ?irel3 ?iobj3
+                        OPTIONAL {
+                            ?iobj1 ?irel2 ?iobj2
+                                MINUS { ?iobj1 a bf:Work }
+                                MINUS { ?iobj1 a bf:Instance }
+                            OPTIONAL {
+                                ?iobj2 ?irel3 ?iobj3
+                                    MINUS { ?iobj2 a bf:Work }
+                                    MINUS { ?iobj2 a bf:Instance }
+                            }
+                        }
                     }
                 }
             </present>
@@ -242,7 +294,7 @@
 
         <!-- Instance database -->
 
-        <db path="instance" schema="sparql-results" include="thing">
+        <db path="instance" schema="sparql-results" include="thing smallindex">
             <criteria>?thing a bf:Instance</criteria>
 
             <!-- Title indexes -->
@@ -255,8 +307,8 @@
 
             <!-- instancetitle is also pretty common -->
             <index type="bf.instancetitle">
-                ?thing bf:instanceTitle ?it .
-                ?it bf:titleValue %v FILTER(contains(%v, %s))
+                ?thing bf:instanceTitle %v_it .
+                %v_it bf:titleValue %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.titlestatement">
@@ -267,8 +319,8 @@
             a given title has been indexed -->
             <index type="bf.maintitle">
                 {
-                    ?thing bf:instanceTitle ?it .
-                    ?it bf:titleValue %v FILTER(contains(%v, %s))
+                    ?thing bf:instanceTitle %v_it .
+                    %v_it bf:titleValue %v FILTER(contains(%v, %s))
                 } UNION {
                     ?thing bf:title %v FILTER(contains(%v, %s))
                 }
@@ -277,13 +329,13 @@
 
             <!-- the instancetitle can also contain a subtitle and a parttitle -->
             <index type="bf.subtitle">
-                ?thing bf:instanceTitle ?it .
-                ?it bf:subtitle %v FILTER(contains(%v, %s))
+                ?thing bf:instanceTitle %v_it .
+                %v_it bf:subtitle %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.parttitle">
-                ?thing bf:instanceTitle ?it .
-                ?it bf:partTitle %v FILTER(contains(%v, %s))
+                ?thing bf:instanceTitle %v_it .
+                %v_it bf:partTitle %v FILTER(contains(%v, %s))
             </index>
             <!-- We could also go to the works, and get those titles... -->
 
@@ -294,62 +346,99 @@
                 } UNION {
                     ?thing bf:titleStatement %v FILTER(contains(%v, %s))
                 } UNION {
-                    ?thing ?titlerel ?it . <!-- any kind of link -->
-                    ?it a bf:Title <!-- to something that is a title -->
+                    ?thing ?titlerel %v_it . <!-- any kind of link -->
+                    %v_it a bf:Title <!-- to something that is a title -->
                     {
-                        ?it bf:titleValue %v FILTER(contains(%v, %s))
+                        %v_it bf:titleValue %v FILTER(contains(%v, %s))
                     } UNION {
-                        ?it bf:partTitle %v FILTER(contains(%v, %s))
+                        %v_it bf:partTitle %v FILTER(contains(%v, %s))
                     } UNION {
-                        ?it bf:subtitle %v FILTER(contains(%v, %s))
+                        %v_it bf:subtitle %v FILTER(contains(%v, %s))
                     }
                 }
             </index>
 
             <!-- Author indexes. Many instances don't have any, works do -->
             <index type="bf.creator">
-                ?thing bf:creator ?c .
-                ?c bf:label %v FILTER(contains(%v, %s))
+                ?thing bf:creator %v_cr .
+                %v_cr bf:label %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.workcreator">
-                ?thing bf:instanceOf ?work .
-                ?work bf:creator ?c .
-                ?c bf:label %v FILTER(contains(%v, %s))
+                ?thing bf:instanceOf %v_work .
+                %v_work bf:creator %v_cr .
+                %v_cr bf:label %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.workcontributor">
-                ?thing bf:instanceOf ?work .
-                ?work bf:contributor ?c .
-                ?c bf:label %v FILTER(contains(%v, %s))
+                ?thing bf:instanceOf %v_work .
+                %v_work bf:contributor %v_co .
+                %v_co bf:label %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.contributor">
-                ?thing bf:contributor ?c .
-                ?c bf:label %v FILTER(contains(%v, %s))
+                ?thing bf:contributor %v_co .
+                %v_co bf:label %v FILTER(contains(%v, %s))
             </index>
 
             <index type="bf.anyauthor">
                 {
-                    ?thing bf:creator ?c .
-                    ?c bf:label %v FILTER(contains(%v, %s))
+                    ?thing bf:creator %v_cr .
+                    %v_cr bf:label %v FILTER(contains(%v, %s))
                 } UNION {
-                    ?thing bf:contributor ?c .
-                    ?c bf:label %v FILTER(contains(%v, %s))
+                    ?thing bf:contributor %v_co .
+                    %v_co bf:label %v FILTER(contains(%v, %s))
                 } UNION {
-                    ?thing bf:instanceOf ?work .
-                    ?work bf:creator ?c .
-                    ?c bf:label %v FILTER(contains(%v, %s))
+                    ?thing bf:instanceOf %v_work .
+                    %v_work bf:creator %v_wcr .
+                    %v_wcr bf:label %v FILTER(contains(%v, %s))
                 } UNION {
-                    ?thing bf:instanceOf ?work .
-                    ?work bf:contributor ?c .
-                    ?c bf:label %v FILTER(contains(%v, %s))
+                    ?thing bf:instanceOf %v_work .
+                    %v_work bf:contributor %v_wco .
+                    %v_wco bf:label %v FILTER(contains(%v, %s))
                 }
             </index>
 
-            <!-- Presetn formats. BF-L comes from "thing" -->
+            <!-- isbn index. The Instance may contain a isbn10 or isbn13. -->
+            <!-- These can be literal values like -->
+            <!--   http://isbn.example.org/1906833214 which we need to search -->
+            <!-- by our usual substring match. Or they can be links to Identivfiers -->
+            <!-- which will have a proper identifierValue on which we can do -->
+            <!-- an exact match.  -->
+            <index type="bf.isbn">
+                {
+                    ?thing bf:isbn10  %v
+                        FILTER(isUri(%v) &amp;&amp; contains(str(%v), %s))
+                } UNION {
+                    ?thing bf:isbn13  %v
+                        FILTER(isUri(%v) &amp;&amp; contains(str(%v), %s))
+                } UNION {
+                    {
+                        ?thing bf:isbn10 %v_isbn
+                    } UNION {
+                        ?thing bf:isbn13 %v_isbn
+                    }
+                    %v_isbn a bf:Identifier  .
+                    %v_isbn bf:identifierValue  %v FILTER( %v = %s )
+                }
+            </index>
+
+            <!-- lccn number, a simpler index for id numbers -->
+            <index type="bf.lccn">
+                ?thing bf:lccn %v_lccn .
+                %v_lccn a bf:Identifier  .
+                %v_lccn bf:identifierValue  %v FILTER( %v = %s )
+            </index>
+
+            <!-- Find the instances of a given work -->
+            <index type="bf.work">
+                ?thing bf:instanceOf %u
+            </index>
+
+
+            <!-- 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 .
@@ -360,33 +449,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 }
                             }
                         }
                     }
@@ -405,7 +489,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 {
@@ -518,26 +602,17 @@
         </db>
 
         <!-- A hack to be able to look at any triplet in the base -->
-        <!-- TODO - Switch to the new system, probably using "small" -->
-        <db path="node" 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 ?node ?rel ?obj</form>
-            <index type="any">?node ?rel ?obj FILTER( str(?node) = %s )</index>
-        </db>
-        <!-- A way to see which triplets refers to a given uri. -->
-        <!-- TODO - Switch to the new system, probably using "small" -->
-        <db path="ref" 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 ?node ?rel ?obj</form>
-            <index type="any">?node ?rel ?obj FILTER( str(?obj) = %s )</index>
+        <!-- The indexes bf.uri and bf.ref can also come in handy here -->
+        <db path="node" schema="sparql-results" include="smallbody">
+            <index type="any">
+                ?thing ?rel ?obj FILTER( str(?thing) = %s )
+            </index>
         </db>
+
     </filter>
 
     <filter type="log">
         <message>http</message>
-        <category apdu="true"/>
     </filter>
 
     <filter type="http_client">