From 18a302916fcdc2b3d519201eabf31d3fa313806e Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Thu, 24 Oct 2024 00:52:20 +0200 Subject: [PATCH] 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 . + } +}