From 135d81db804ba707eff53f29350b875f9bcd6dbc Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 19 May 2025 16:40:33 +0200 Subject: [PATCH] lib/search/kanji: query kanji parts --- lib/models/kanji_search/kanji_search_result.dart | 5 +++-- lib/search/kanji_search.dart | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/models/kanji_search/kanji_search_result.dart b/lib/models/kanji_search/kanji_search_result.dart index 7258084..36046ca 100644 --- a/lib/models/kanji_search/kanji_search_result.dart +++ b/lib/models/kanji_search/kanji_search_result.dart @@ -38,8 +38,9 @@ class KanjiSearchResult extends Equatable { /// Information about this character's radical, if applicable. final KanjiSearchRadical? radical; - // TODO: document more accurately what kind of parts? - /// The parts used in this kanji. + /// All radicals/kanji parts that make up this kanji. + /// + /// Note that this list might not always be complete. final List parts; const KanjiSearchResult({ diff --git a/lib/search/kanji_search.dart b/lib/search/kanji_search.dart index 7ae8804..3b2ddf9 100644 --- a/lib/search/kanji_search.dart +++ b/lib/search/kanji_search.dart @@ -68,10 +68,10 @@ Future searchKanjiWithDbConnection( whereArgs: [kanji], ); - late final List> radical_names; - final radical_names_query = connection.query( - "KANJIDIC_RadicalName", - where: "KANJIDIC_RadicalName.kanji = ?", + late final List> parts; + final parts_query = connection.query( + "RADKFILE", + where: "RADKFILE.kanji = ?", whereArgs: [kanji], ); @@ -116,7 +116,7 @@ Future searchKanjiWithDbConnection( dictionary_references_query.then((value) => dictionary_references = value), query_codes_query.then((value) => query_codes = value), radicals_query.then((value) => radicals = value), - radical_names_query.then((value) => radical_names = value), + parts_query.then((value) => parts = value), readings_query.then((value) => readings = value), stroke_miscounts_query.then((value) => stroke_miscounts = value), variants_query.then((value) => variants = value), @@ -153,6 +153,7 @@ Future searchKanjiWithDbConnection( strokeCount: entry['strokeCount'] as int, meanings: meanings.map((item) => item['meaning'] as String).toList(), kunyomi: kunyomis.map((item) => item['yomi'] as String).toList(), + parts: parts.map((item) => item['radical'] as String).toList(), onyomi: onyomis.map((item) => item['yomi'] as String).toList(), ); }