typo

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

diff --git a/bibframe/triplestore.xml b/bibframe/triplestore.xml
index 000f8ce..8de1293 100644 (file)
--- a/bibframe/triplestore.xml
+++ b/bibframe/triplestore.xml
@@ -24,11 +24,10 @@
             <!-- Each db is supposed to provide a dedicated BF-F 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>
 
@@ -177,12 +176,12 @@
 
                     OPTIONAL {
                         ?wobj1 ?wrel2 ?wobj2
-                        MINUS { ?wobj1 a bf:Work }
-                        MINUS { ?wobj1 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 }
+                                MINUS { ?wobj2 a bf:Work }
+                                MINUS { ?wobj2 a bf:Instance }
                         }
                     }
                     <!-- Link to the instance(s) -->
@@ -191,12 +190,12 @@
                         ?inst ?irel1 ?iobj1
                         OPTIONAL {
                             ?iobj1 ?irel2 ?iobj2
-                            MINUS { ?iobj1 a bf:Work }
-                            MINUS { ?iobj1 a bf:Instance }
+                                MINUS { ?iobj1 a bf:Work }
+                                MINUS { ?iobj1 a bf:Instance }
                             OPTIONAL {
                                 ?iobj2 ?irel3 ?iobj3
-                                MINUS { ?iobj2 a bf:Work }
-                                MINUS { ?iobj2 a bf:Instance }
+                                    MINUS { ?iobj2 a bf:Work }
+                                    MINUS { ?iobj2 a bf:Instance }
                             }
                         }
                     }
@@ -324,29 +323,28 @@
                 }
                 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:Work }
+                            MINUS { ?iobj2 a bf:Instance } .
                         OPTIONAL {
                             ?iobj2 ?irel3 ?iobj3
-                            MINUS { ?iobj3 a bf:Work }
-                            MINUS { ?iobj3 a bf:Instance }
+                                MINUS { ?iobj3 a bf:Work }
+                                MINUS { ?iobj3 a bf:Instance }
                         }
                     }
-
-                    OPTIONAL {
-                        %u bf:instanceOf ?work
-                        ?work ?wrel1 ?wobj1
+                    OPTIONAL { <!-- Work -->
+                        %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:Work }
+                                MINUS { ?wobj1 a bf:Instance } .
                             OPTIONAL {
                                 ?wobj2 ?wrel3 ?wobj3
-                                MINUS { ?wobj2 a bf:Work }
-                                MINUS { ?wobj2 a bf:Instance }
+                                    MINUS { ?wobj2 a bf:Work }
+                                    MINUS { ?wobj2 a bf:Instance }
                             }
                         }
                     }