From e3970f4cf1a33fd12a91fcb79f86b6196ef427de Mon Sep 17 00:00:00 2001
From: Andrew Tavis McAllister <andrew.t.mcallister@gmail.com>
Date: Sat, 30 Mar 2024 18:25:14 +0100
Subject: [PATCH] Minor query formatting and add back in lexeme ID

---
 .../Japanese/nouns/query_nouns.sparql         | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql
index 7e7d95eaa..5d2bfc913 100644
--- a/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql
@@ -1,26 +1,23 @@
-PREFIX wikibase: <http://wikiba.se/ontology#>
-
-PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX dct: <http://purl.org/dc/terms/>
-PREFIX ontolex: <http://www.w3.org/ns/lemon/ontolex#>
-PREFIX ontolex: <http://www.w3.org/ns/lemon/ontolex#>
-PREFIX wd: <http://www.wikidata.org/entity/>
 # All Japanese (Q5287) nouns.
 # Enter this query at https://query.wikidata.org/.
 
 SELECT DISTINCT
- ?lexeme 
- ?noun 
- 
- WHERE {
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
+  ?noun
+
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q5287 ;
     wikibase:lexicalCategory ?nounType ;
     wikibase:lemma ?noun .
-  FILTER(?nounType = ?nounTypes)
 
-  BIND(lang(?noun) as ?language)
-  FILTER(CONTAINS(?language, "ja-hira") || CONTAINS(?language, "ja"))
+  FILTER (?nounType = ?nounTypes)
+
+  BIND (lang(?noun) as ?language)
+
+  FILTER (
+    CONTAINS(?language, "ja-hira") || CONTAINS(?language, "ja")
+  )
 }