From 1d5d0889b461007dad82bbd68038a5e8176f0187 Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Mon, 21 Oct 2024 16:20:48 +0300 Subject: [PATCH 01/11] Expand Norwegian/Bokmal verb query --- .../Bokm\303\245l/verbs/query_verbs.sparql" | 69 ++++++++++++++----- .../Bokm\303\245l/verbs/query_verbs_1.sparql" | 51 ++++++++++++++ 2 files changed, 104 insertions(+), 16 deletions(-) create mode 100644 "src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index 2ea0cad4e..69b371476 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -1,30 +1,67 @@ # tool: scribe-data -# All Norwegian Bokmål (Q9043) verbs (Q24905) and the given forms. +# All Bokmål (Q25167) verbs and basic forms. # Enter this query at https://query.wikidata.org/. -# Note: This query is for Bokmål (Q25167) rather than Nynorsk (Q25164). - SELECT (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID) - ?infinitive - ?present + ?presentPerfect + ?imperative + ?preterite + ?infinitiveActive + ?presentTenseActive + ?infinitivePassive + ?presentTensePassive WHERE { - ?lexeme dct:language wd:Q25167 ; - wikibase:lexicalCategory wd:Q24905 . + ?lexeme dct:language wd:Q25167; + wikibase:lexicalCategory wd:Q24905. # Assuming the lexical category for verbs + + # MARK: present perfect + OPTIONAL { + ?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. + } + + # MARK: preterite + OPTIONAL { + ?lexeme ontolex:lexicalForm ?preteriteForm. + ?preteriteForm ontolex:representation ?preterite; + wikibase:grammaticalFeature wd:Q442485. + } - # MARK: Active Infinitive + # MARK: infinitive active + OPTIONAL { + ?lexeme ontolex:lexicalForm ?infinitiveActiveForm. + ?infinitiveActiveForm ontolex:representation ?infinitiveActive; + wikibase:grammaticalFeature wd:Q179230, wd:Q1317831. + } - ?lexeme ontolex:lexicalForm ?infinitiveForm . - ?infinitiveForm ontolex:representation ?infinitive ; - wikibase:grammaticalFeature wd:Q179230 ; - wikibase:grammaticalFeature wd:Q1317831 . + # MARK: present tense active + OPTIONAL { + ?lexeme ontolex:lexicalForm ?presentTenseActiveForm. + ?presentTenseActiveForm ontolex:representation ?presentTenseActive; + wikibase:grammaticalFeature wd:Q192613, wd:Q1317831. + } - # MARK: Active Present + # MARK: infinitive passive + OPTIONAL { + ?lexeme ontolex:lexicalForm ?infinitivePassiveForm. + ?infinitivePassiveForm ontolex:representation ?infinitivePassive; + wikibase:grammaticalFeature wd:Q179230, wd:Q1194697. + } + # MARK: present tense passive OPTIONAL { - ?lexeme ontolex:lexicalForm ?presentForm . - ?presentForm ontolex:representation ?present ; - wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 . + ?lexeme ontolex:lexicalForm ?presentTensePassiveForm. + ?presentTensePassiveForm ontolex:representation ?presentTensePassive; + wikibase:grammaticalFeature wd:Q192613, wd:Q1194697. } } diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" new file mode 100644 index 000000000..0e8a982ba --- /dev/null +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" @@ -0,0 +1,51 @@ +# tool: scribe-data +# All Bokmål (Q25167) verbs and additional forms. +# Enter this query at https://query.wikidata.org/. + +SELECT + (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID) + ?presentParticiple + ?masculineFeminineSingularIndefinitePastParticiple + ?neuterSingularIndefinitePastParticiple + ?singularDefinitePastParticiple + ?pluralPastParticiple + +WHERE { + ?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. + } + + # 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. + } + + # 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. + } + + # MARK: singular definite past participle + OPTIONAL { + ?lexeme ontolex:lexicalForm ?singularDefinitePastParticipleForm. + ?singularDefinitePastParticipleForm ontolex:representation ?singularDefinitePastParticiple; + 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. + } +} From 0014c291919bf50c8da034ec7045bb482626b824 Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Tue, 22 Oct 2024 09:21:50 +0300 Subject: [PATCH 02/11] fix conflict --- .../Bokm\303\245l/verbs/query_verbs.sparql" | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index 69b371476..f5a8ff22a 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -11,10 +11,12 @@ SELECT ?presentTenseActive ?infinitivePassive ?presentTensePassive + ?infinitive + ?activePresent WHERE { ?lexeme dct:language wd:Q25167; - wikibase:lexicalCategory wd:Q24905. # Assuming the lexical category for verbs + wikibase:lexicalCategory wd:Q24905. # MARK: present perfect OPTIONAL { @@ -23,6 +25,12 @@ WHERE { wikibase:grammaticalFeature wd:Q1240211. } + OPTIONAL { + ?lexeme ontolex:lexicalForm ?infinitiveForm . + ?infinitiveForm ontolex:representation ?infinitive ; + wikibase:grammaticalFeature wd:Q179230, wd:Q1317831 . + } + # MARK: imperative OPTIONAL { ?lexeme ontolex:lexicalForm ?imperativeForm. @@ -64,4 +72,10 @@ WHERE { ?presentTensePassiveForm ontolex:representation ?presentTensePassive; wikibase:grammaticalFeature wd:Q192613, wd:Q1194697. } + + OPTIONAL{ + ?lexeme ontolex:lexicalForm ?activePresentForm . + ?activePresentForm ontolex:representation ?activePresent ; + wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 . + } } From cb17bc9260f234f73b984dceb0691510192059ca Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Tue, 22 Oct 2024 09:26:52 +0300 Subject: [PATCH 03/11] fix conflict --- .../Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index f5a8ff22a..cbb98db8b 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -26,9 +26,9 @@ WHERE { } OPTIONAL { - ?lexeme ontolex:lexicalForm ?infinitiveForm . - ?infinitiveForm ontolex:representation ?infinitive ; - wikibase:grammaticalFeature wd:Q179230, wd:Q1317831 . + ?lexeme ontolex:lexicalForm ?infinitiveForm . + ?infinitiveForm ontolex:representation ?infinitive ; + wikibase:grammaticalFeature wd:Q179230, wd:Q1317831 . } # MARK: imperative @@ -74,7 +74,7 @@ WHERE { } OPTIONAL{ - ?lexeme ontolex:lexicalForm ?activePresentForm . + ?lexeme ontolex:lexicalForm ?activePresentForm . ?activePresentForm ontolex:representation ?activePresent ; wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 . } From 9b744642016b31e701e27406d5b7240fc1d33a48 Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Tue, 22 Oct 2024 09:30:38 +0300 Subject: [PATCH 04/11] fix conflict --- .../Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index cbb98db8b..46875b1df 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -31,6 +31,7 @@ WHERE { wikibase:grammaticalFeature wd:Q179230, wd:Q1317831 . } + # MARK: imperative OPTIONAL { ?lexeme ontolex:lexicalForm ?imperativeForm. @@ -40,6 +41,7 @@ WHERE { # MARK: preterite OPTIONAL { + ?lexeme ontolex:lexicalForm ?preteriteForm. ?preteriteForm ontolex:representation ?preterite; wikibase:grammaticalFeature wd:Q442485. From 91114f1bbe90bc9cee8092e84522d120f0796577 Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Tue, 22 Oct 2024 09:32:53 +0300 Subject: [PATCH 05/11] fix conflict --- .../Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index 46875b1df..e89c72d60 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -30,8 +30,6 @@ WHERE { ?infinitiveForm ontolex:representation ?infinitive ; wikibase:grammaticalFeature wd:Q179230, wd:Q1317831 . } - - # MARK: imperative OPTIONAL { ?lexeme ontolex:lexicalForm ?imperativeForm. @@ -76,6 +74,7 @@ WHERE { } OPTIONAL{ + ?lexeme ontolex:lexicalForm ?activePresentForm . ?activePresentForm ontolex:representation ?activePresent ; wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 . From de1c40a02ef4a700d59e6d451d4d75432b34d51f Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Tue, 22 Oct 2024 09:37:50 +0300 Subject: [PATCH 06/11] =?UTF-8?q?Resolved=20merge=20conflict=20in=20Bokm?= =?UTF-8?q?=C3=A5l=20verb=20query?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bokm\303\245l/verbs/query_verbs.sparql" | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index e89c72d60..134838e2c 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -25,11 +25,13 @@ WHERE { wikibase:grammaticalFeature wd:Q1240211. } + # MARK: infinitive OPTIONAL { - ?lexeme ontolex:lexicalForm ?infinitiveForm . - ?infinitiveForm ontolex:representation ?infinitive ; - wikibase:grammaticalFeature wd:Q179230, wd:Q1317831 . + ?lexeme ontolex:lexicalForm ?infinitiveForm. + ?infinitiveForm ontolex:representation ?infinitive; + wikibase:grammaticalFeature wd:Q179230, wd:Q1317831. } + # MARK: imperative OPTIONAL { ?lexeme ontolex:lexicalForm ?imperativeForm. @@ -39,7 +41,6 @@ WHERE { # MARK: preterite OPTIONAL { - ?lexeme ontolex:lexicalForm ?preteriteForm. ?preteriteForm ontolex:representation ?preterite; wikibase:grammaticalFeature wd:Q442485. @@ -73,10 +74,10 @@ WHERE { wikibase:grammaticalFeature wd:Q192613, wd:Q1194697. } - OPTIONAL{ - - ?lexeme ontolex:lexicalForm ?activePresentForm . - ?activePresentForm ontolex:representation ?activePresent ; - wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 . + # MARK: active present + OPTIONAL { + ?lexeme ontolex:lexicalForm ?activePresentForm. + ?activePresentForm ontolex:representation ?activePresent; + wikibase:grammaticalFeature wd:Q192613, wd:Q1317831. } } From 23aa5595ac5c11908ff922f16e43b57b57ea07dc Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Wed, 23 Oct 2024 19:15:56 +0300 Subject: [PATCH 07/11] fix check error --- .../Bokm\303\245l/verbs/query_verbs.sparql" | 78 ++++++++----------- .../Bokm\303\245l/verbs/query_verbs_1.sparql" | 40 +++++----- 2 files changed, 51 insertions(+), 67 deletions(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index 4aadf7ec1..e6d38f494 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/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\303\245l/verbs/query_verbs_1.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" index 0e8a982ba..3ea40ab49 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/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 . } } From 90e268dc5b028e7247e11c0006a95a92289bbaab Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Wed, 23 Oct 2024 19:33:51 +0300 Subject: [PATCH 08/11] fix check error --- .../Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" | 4 ++-- .../Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index e6d38f494..42e2597e3 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -8,8 +8,8 @@ SELECT ?presentPerfect ?imperative ?preterite - #?passiveInfinitive - #?passivePresent + ?passiveInfinitive + ?passivePresent ?activePresent WHERE { diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" index 3ea40ab49..341317702 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" @@ -35,7 +35,7 @@ WHERE { wikibase:grammaticalFeature wd:Q12717679, wd:Q1775461, wd:Q110786, wd:Q53997857 . } - # MARK: singular definite past participle + # MARK: definite singular past participle OPTIONAL { ?lexeme ontolex:lexicalForm ?definiteSingularPastParticipleForm . ?definiteSingularPastParticipleForm ontolex:representation ?definiteSingularPastParticiple ; From 7ff46280096874952c4c94c64f4bba24d218bc40 Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Wed, 23 Oct 2024 19:37:20 +0300 Subject: [PATCH 09/11] remove hash --- .../Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index 42e2597e3..233e5e194 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -44,11 +44,11 @@ WHERE { } # MARK: passive infinitive - #OPTIONAL { - # ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm . - #?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ; - # wikibase:grammaticalFeature wd:Q1194697 , wd:Q179230 . - #} + OPTIONAL { + ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm . + ?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ; + wikibase:grammaticalFeature wd:Q1194697 , wd:Q179230 . + } # MARK: passive Present OPTIONAL { From 714512181faf88bab57074a53c9440ae345b22fd Mon Sep 17 00:00:00 2001 From: Veronica Waiganjo Date: Wed, 23 Oct 2024 19:39:28 +0300 Subject: [PATCH 10/11] fix ceck error --- .../Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" index 233e5e194..19eb882df 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" @@ -47,7 +47,7 @@ WHERE { OPTIONAL { ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm . ?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ; - wikibase:grammaticalFeature wd:Q1194697 , wd:Q179230 . + wikibase:grammaticalFeature wd:Q1194697, wd:Q179230 . } # MARK: passive Present From 18a302916fcdc2b3d519201eabf31d3fa313806e Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Thu, 24 Oct 2024 00:52:20 +0200 Subject: [PATCH 11/11] Rename queries to fix merge conflict --- .../Bokm\303\245l/verbs/query_verbs.sparql" | 66 ------------------ .../Bokm\303\245l/verbs/query_verbs_1.sparql" | 67 ++++++++++++------- .../Bokm\303\245l/verbs/query_verbs_2.sparql" | 51 ++++++++++++++ 3 files changed, 92 insertions(+), 92 deletions(-) delete mode 100644 "src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" create mode 100644 "src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_2.sparql" diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" deleted file mode 100644 index 19eb882df..000000000 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" +++ /dev/null @@ -1,66 +0,0 @@ -# tool: scribe-data -# All Bokmål (Q25167) verbs and basic forms. -# Enter this query at https://query.wikidata.org/. - -SELECT - (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID) - ?activeInfinitive - ?presentPerfect - ?imperative - ?preterite - ?passiveInfinitive - ?passivePresent - ?activePresent - -WHERE { - ?lexeme dct:language wd:Q25167 ; - wikibase:lexicalCategory wd:Q24905 . - - # MARK: active Infinitive - - ?lexeme ontolex:lexicalForm ?activeInfinitiveForm . - ?activeInfinitiveForm ontolex:representation ?activeInfinitive ; - wikibase:grammaticalFeature wd:Q1317831 , wd:Q179230 . - - # MARK: present perfect - OPTIONAL { - ?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 . - } - - # MARK: preterite - OPTIONAL { - ?lexeme ontolex:lexicalForm ?preteriteForm . - ?preteriteForm ontolex:representation ?preterite ; - wikibase:grammaticalFeature wd:Q442485 . - } - - # MARK: passive infinitive - OPTIONAL { - ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm . - ?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ; - wikibase:grammaticalFeature wd:Q1194697, wd:Q179230 . - } - - # MARK: passive Present - OPTIONAL { - ?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:Q1317831, wd:Q192613 . - } -} diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" index 341317702..19eb882df 100644 --- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_1.sparql" @@ -1,51 +1,66 @@ # tool: scribe-data -# All Bokmål (Q25167) verbs and additional forms. +# All Bokmål (Q25167) verbs and basic forms. # Enter this query at https://query.wikidata.org/. SELECT (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID) - ?presentParticiple - ?feminineMasculineIndefiniteSingularPastParticiple - ?neuterIndefiniteSingularPastParticiple - ?definiteSingularPastParticiple - ?pluralPastParticiple + ?activeInfinitive + ?presentPerfect + ?imperative + ?preterite + ?passiveInfinitive + ?passivePresent + ?activePresent WHERE { ?lexeme dct:language wd:Q25167 ; wikibase:lexicalCategory wd:Q24905 . - # MARK: present participle + # MARK: active Infinitive + + ?lexeme ontolex:lexicalForm ?activeInfinitiveForm . + ?activeInfinitiveForm ontolex:representation ?activeInfinitive ; + wikibase:grammaticalFeature wd:Q1317831 , wd:Q179230 . + + # MARK: present perfect + OPTIONAL { + ?lexeme ontolex:lexicalForm ?presentPerfectForm . + ?presentPerfectForm ontolex:representation ?presentPerfect ; + wikibase:grammaticalFeature wd:Q1240211 . + } + + # MARK: imperative OPTIONAL { - ?lexeme ontolex:lexicalForm ?presentParticipleForm . - ?presentParticipleForm ontolex:representation ?presentParticiple ; - wikibase:grammaticalFeature wd:Q10345583 . + ?lexeme ontolex:lexicalForm ?imperativeForm . + ?imperativeForm ontolex:representation ?imperative ; + wikibase:grammaticalFeature wd:Q22716 . } - # MARK: masculine feminine singular indefinite past participle + # MARK: preterite OPTIONAL { - ?lexeme ontolex:lexicalForm ?feminineMasculineIndefiniteSingularPastParticipleForm . - ?feminineMasculineIndefiniteSingularPastParticipleForm ontolex:representation ?feminineMasculineIndefiniteSingularPastParticiple ; - wikibase:grammaticalFeature wd:Q1775415, wd:Q499327, wd:Q53997857, wd:Q110786, wd:Q12717679 . + ?lexeme ontolex:lexicalForm ?preteriteForm . + ?preteriteForm ontolex:representation ?preterite ; + wikibase:grammaticalFeature wd:Q442485 . } - # MARK: neuter singular indefinite past participle + # MARK: passive infinitive OPTIONAL { - ?lexeme ontolex:lexicalForm ?neuterIndefiniteSingularPastParticipleForm . - ?neuterIndefiniteSingularPastParticipleForm ontolex:representation ?neuterIndefiniteSingularPastParticiple ; - wikibase:grammaticalFeature wd:Q12717679, wd:Q1775461, wd:Q110786, wd:Q53997857 . + ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm . + ?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ; + wikibase:grammaticalFeature wd:Q1194697, wd:Q179230 . } - # MARK: definite singular past participle + # MARK: passive Present OPTIONAL { - ?lexeme ontolex:lexicalForm ?definiteSingularPastParticipleForm . - ?definiteSingularPastParticipleForm ontolex:representation ?definiteSingularPastParticiple ; - wikibase:grammaticalFeature wd:Q12717679, wd:Q110786, wd:Q53997851 . + ?lexeme ontolex:lexicalForm ?passivePresentForm . + ?passivePresentForm ontolex:representation ?passivePresent ; + wikibase:grammaticalFeature wd:Q1194697, wd:Q192613 . } - # MARK: plural past participle + # MARK: active present OPTIONAL { - ?lexeme ontolex:lexicalForm ?pluralPastParticipleForm . - ?pluralPastParticipleForm ontolex:representation ?pluralPastParticiple ; - wikibase:grammaticalFeature wd:Q12717679, wd:Q146786 . + ?lexeme ontolex:lexicalForm ?activePresentForm . + ?activePresentForm ontolex:representation ?activePresent ; + wikibase:grammaticalFeature wd:Q1317831, wd:Q192613 . } } diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_2.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_2.sparql" new file mode 100644 index 000000000..341317702 --- /dev/null +++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs_2.sparql" @@ -0,0 +1,51 @@ +# tool: scribe-data +# All Bokmål (Q25167) verbs and additional forms. +# Enter this query at https://query.wikidata.org/. + +SELECT + (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID) + ?presentParticiple + ?feminineMasculineIndefiniteSingularPastParticiple + ?neuterIndefiniteSingularPastParticiple + ?definiteSingularPastParticiple + ?pluralPastParticiple + +WHERE { + ?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 . + } + + # MARK: masculine feminine singular indefinite past participle + OPTIONAL { + ?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 ?neuterIndefiniteSingularPastParticipleForm . + ?neuterIndefiniteSingularPastParticipleForm ontolex:representation ?neuterIndefiniteSingularPastParticiple ; + wikibase:grammaticalFeature wd:Q12717679, wd:Q1775461, wd:Q110786, wd:Q53997857 . + } + + # MARK: definite singular past participle + OPTIONAL { + ?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 . + } +}