queries: constraining ?work_type before refering to it

trying to make it more readable
inventaire · Nov 9, 2019 · 04397e4 · 04397e4
1 parent 107218f
commit 04397e4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/server/data/wikidata/queries/editions_reverse_claims.coffee b/server/data/wikidata/queries/editions_reverse_claims.coffee
@@ -8,8 +8,8 @@ module.exports =
       ?item wdt:P31 wd:Q3331189 .
       # Filter-out entities tagged as both work and edition
       FILTER NOT EXISTS {
-        ?item wdt:P31 ?work_type
         VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
+        ?item wdt:P31 ?work_type
       }
     }
     LIMIT 1000

diff --git a/server/data/wikidata/queries/humans_reverse_claims.coffee b/server/data/wikidata/queries/humans_reverse_claims.coffee
@@ -9,8 +9,8 @@ module.exports =
 
       # Keep only humans that are known for at least one work
       ?work wdt:P50 ?item .
-      ?work wdt:P31 ?work_type .
       VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
+      ?work wdt:P31 ?work_type .
     }
     LIMIT 1000
     """
diff --git a/server/data/wikidata/queries/serie_parts.coffee b/server/data/wikidata/queries/serie_parts.coffee
@@ -19,8 +19,8 @@ module.exports =
         ?part wdt:P31 wd:Q3331189
         # but recover parts that are also instances of work
         FILTER NOT EXISTS {
-          ?part wdt:P31 ?work_type .
           VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
+          ?part wdt:P31 ?work_type .
         }
       }
 

diff --git a/server/data/wikidata/queries/works_reverse_claims.coffee b/server/data/wikidata/queries/works_reverse_claims.coffee
@@ -5,8 +5,8 @@ module.exports =
     """
     SELECT DISTINCT ?item WHERE {
       ?item wdt:#{pid} wd:#{qid} .
-      ?item wdt:P31 ?work_type .
       VALUES (?work_type) { (wd:Q571) (wd:Q47461344) (wd:Q7725634) (wd:Q2831984) (wd:Q1004) (wd:Q1760610) (wd:Q8274) } .
+      ?item wdt:P31 ?work_type .
     }
     LIMIT 1000
     """