X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=bibframe%2Ftriplestore.xml;h=25fab14cb9dd16072a19906a9f9b510b0b90e44c;hb=f46a54721c067a4146453148774dfeb4c17a6a40;hp=f59629e5df1fd2738011db435818d8eb196289c7;hpb=24426789587262eecf32286b0655b2314977b6eb;p=mp-sparql-moved-to-github.git
diff --git a/bibframe/triplestore.xml b/bibframe/triplestore.xml
index f59629e..25fab14 100644
--- a/bibframe/triplestore.xml
+++ b/bibframe/triplestore.xml
@@ -108,15 +108,11 @@
-
{
- ?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 .
+ ?thing bf:title %v FILTER(contains(%v, %s))
+ } UNION {
+ ?thing ?titlerel ?ti .
?ti a bf:Title
{
?ti bf:titleValue %v FILTER(contains(%v, %s))
@@ -130,7 +126,6 @@
?inst bf:instanceTitle ?it .
?it bf:titleValue %v FILTER(contains(%v, %s))
} UNION {
- ?thing bf:title %v FILTER(contains(%v, %s))
}
@@ -181,30 +176,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 }
- }
}
}
OPTIONAL {
- ?inst bf:instanceOf %u
- OPTIONAL {
- ?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,7 +311,7 @@
}
-
+
CONSTRUCT {
@@ -335,30 +327,25 @@
%u ?irel1 ?iobj1
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 }
+ OPTIONAL {
+ ?iobj2 ?irel3 ?iobj3
+ MINUS { ?iobj3 a bf:Work }
+ MINUS { ?iobj3 a bf:Instance }
}
}
-
- OPTIONAL {
+ OPTIONAL {
%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 }
}
}
}