Skip to content

Commit

Permalink
Rename queries to fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewtavis committed Oct 23, 2024
1 parent 7145121 commit 18a3029
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 92 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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 .
}
}
Original file line number Diff line number Diff line change
@@ -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 .
}
}

0 comments on commit 18a3029

Please sign in to comment.