fix check error

scribe-org · Oct 23, 2024 · 23aa559 · 23aa559
1 parent abac4c5
commit 23aa559
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 67 deletions.
diff --git a/src/scribe_data/language_data_extraction/Norwegian/Bokmål/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Norwegian/Bokmål/verbs/query_verbs.sparql
@@ -4,79 +4,63 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?activeInfinitive
   ?presentPerfect
   ?imperative
   ?preterite
-  ?infinitiveActive
-  ?presentTenseActive
-  ?infinitivePassive
-  ?presentTensePassive
+  #?passiveInfinitive
+  #?passivePresent
   ?activePresent
 
 WHERE {
-  ?lexeme dct:language wd:Q25167;
-          wikibase:lexicalCategory wd:Q24905.
+  ?lexeme dct:language wd:Q25167 ;
+          wikibase:lexicalCategory wd:Q24905 .
 
-  # MARK: present perfect
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentPerfectForm.
-    ?presentPerfectForm ontolex:representation ?presentPerfect;
-      wikibase:grammaticalFeature wd:Q1240211.
-  }
+  # MARK: active Infinitive
+
+  ?lexeme ontolex:lexicalForm ?activeInfinitiveForm .
+  ?activeInfinitiveForm ontolex:representation ?activeInfinitive ;
+    wikibase:grammaticalFeature wd:Q1317831 , wd:Q179230 .
 
-  # MARK: infinitive
+  # MARK: present perfect
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitiveForm.
-    ?infinitiveForm ontolex:representation ?infinitive;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q1317831.
+    ?lexeme ontolex:lexicalForm ?presentPerfectForm .
+    ?presentPerfectForm ontolex:representation ?presentPerfect ;
+      wikibase:grammaticalFeature wd:Q1240211 .
   }
 
   # MARK: imperative
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?imperativeForm.
-    ?imperativeForm ontolex:representation ?imperative;
-      wikibase:grammaticalFeature wd:Q22716.
+    ?lexeme ontolex:lexicalForm ?imperativeForm .
+    ?imperativeForm ontolex:representation ?imperative ;
+      wikibase:grammaticalFeature wd:Q22716 .
   }
 
   # MARK: preterite
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?preteriteForm.
-    ?preteriteForm ontolex:representation ?preterite;
-      wikibase:grammaticalFeature wd:Q442485.
+    ?lexeme ontolex:lexicalForm ?preteriteForm .
+    ?preteriteForm ontolex:representation ?preterite ;
+      wikibase:grammaticalFeature wd:Q442485 .
   }
 
-  # MARK: infinitive active
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitiveActiveForm.
-    ?infinitiveActiveForm ontolex:representation ?infinitiveActive;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q1317831.
-  }
-
-  # MARK: present tense active
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentTenseActiveForm.
-    ?presentTenseActiveForm ontolex:representation ?presentTenseActive;
-      wikibase:grammaticalFeature wd:Q192613, wd:Q1317831.
-  }
-
-  # MARK: infinitive passive
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitivePassiveForm.
-    ?infinitivePassiveForm ontolex:representation ?infinitivePassive;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q1194697.
-  }
+  # MARK: passive infinitive
+  #OPTIONAL {
+   # ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm .
+    #?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ;
+     # wikibase:grammaticalFeature wd:Q1194697 , wd:Q179230 .
+  #}
 
-  # MARK: present tense passive
+  # MARK: passive Present
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentTensePassiveForm.
-    ?presentTensePassiveForm ontolex:representation ?presentTensePassive;
-      wikibase:grammaticalFeature wd:Q192613, wd:Q1194697.
+    ?lexeme ontolex:lexicalForm ?passivePresentForm .
+    ?passivePresentForm ontolex:representation ?passivePresent ;
+      wikibase:grammaticalFeature wd:Q1194697, wd:Q192613 .
   }
 
   # MARK: active present
   OPTIONAL {
     ?lexeme ontolex:lexicalForm ?activePresentForm .
     ?activePresentForm ontolex:representation ?activePresent ;
-      wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 .
+      wikibase:grammaticalFeature wd:Q1317831, wd:Q192613 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Norwegian/Bokmål/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/Norwegian/Bokmål/verbs/query_verbs_1.sparql
@@ -5,47 +5,47 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?presentParticiple
-  ?masculineFeminineSingularIndefinitePastParticiple
-  ?neuterSingularIndefinitePastParticiple
-  ?singularDefinitePastParticiple
+  ?feminineMasculineIndefiniteSingularPastParticiple
+  ?neuterIndefiniteSingularPastParticiple
+  ?definiteSingularPastParticiple
   ?pluralPastParticiple
 
 WHERE {
-  ?lexeme dct:language wd:Q25167;
-          wikibase:lexicalCategory wd:Q24905.
+  ?lexeme dct:language wd:Q25167 ;
+          wikibase:lexicalCategory wd:Q24905 .
 
   # MARK: present participle
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentParticipleForm.
-    ?presentParticipleForm ontolex:representation ?presentParticiple;
-      wikibase:grammaticalFeature wd:Q10345583.
+    ?lexeme ontolex:lexicalForm ?presentParticipleForm .
+    ?presentParticipleForm ontolex:representation ?presentParticiple ;
+      wikibase:grammaticalFeature wd:Q10345583 .
   }
 
   # MARK: masculine feminine singular indefinite past participle
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineFeminineSingularIndefinitePastParticipleForm.
-    ?masculineFeminineSingularIndefinitePastParticipleForm ontolex:representation ?masculineFeminineSingularIndefinitePastParticiple;
-      wikibase:grammaticalFeature wd:Q12717679, wd:Q499327, wd:Q1775415, wd:Q110786, wd:Q53997857.
+    ?lexeme ontolex:lexicalForm ?feminineMasculineIndefiniteSingularPastParticipleForm .
+    ?feminineMasculineIndefiniteSingularPastParticipleForm ontolex:representation ?feminineMasculineIndefiniteSingularPastParticiple ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q499327, wd:Q53997857, wd:Q110786, wd:Q12717679 .
   }
 
   # MARK: neuter singular indefinite past participle
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterSingularIndefinitePastParticipleForm.
-    ?neuterSingularIndefinitePastParticipleForm ontolex:representation ?neuterSingularIndefinitePastParticiple;
-      wikibase:grammaticalFeature wd:Q12717679, wd:Q1775461, wd:Q110786, wd:Q53997857.
+    ?lexeme ontolex:lexicalForm ?neuterIndefiniteSingularPastParticipleForm .
+    ?neuterIndefiniteSingularPastParticipleForm ontolex:representation ?neuterIndefiniteSingularPastParticiple ;
+      wikibase:grammaticalFeature wd:Q12717679, wd:Q1775461, wd:Q110786, wd:Q53997857 .
   }
 
   # MARK: singular definite past participle
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?singularDefinitePastParticipleForm.
-    ?singularDefinitePastParticipleForm ontolex:representation ?singularDefinitePastParticiple;
-      wikibase:grammaticalFeature wd:Q12717679, wd:Q110786, wd:Q53997851.
+    ?lexeme ontolex:lexicalForm ?definiteSingularPastParticipleForm .
+    ?definiteSingularPastParticipleForm ontolex:representation ?definiteSingularPastParticiple ;
+      wikibase:grammaticalFeature wd:Q12717679, wd:Q110786, wd:Q53997851 .
   }
 
   # MARK: plural past participle
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pluralPastParticipleForm.
-    ?pluralPastParticipleForm ontolex:representation ?pluralPastParticiple;
-      wikibase:grammaticalFeature wd:Q12717679, wd:Q146786.
+    ?lexeme ontolex:lexicalForm ?pluralPastParticipleForm .
+    ?pluralPastParticipleForm ontolex:representation ?pluralPastParticiple ;
+      wikibase:grammaticalFeature wd:Q12717679, wd:Q146786 .
   }
 }