From bfb0e6ab36ba26731bd866fb2c255f1d35827970 Mon Sep 17 00:00:00 2001 From: Paul Goins Date: Sun, 14 Mar 2010 18:40:52 +0900 Subject: [PATCH] Updated jstring_convert helper. Now using for displaying KD2 readings. --- jbparse/jbparse/kanjidic2.py | 6 +++++- jbparse/jbparse/kanjidic_common.py | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jbparse/jbparse/kanjidic2.py b/jbparse/jbparse/kanjidic2.py index dba0ff9..033ae3c 100644 --- a/jbparse/jbparse/kanjidic2.py +++ b/jbparse/jbparse/kanjidic2.py @@ -167,6 +167,7 @@ class Kanjidic2Node(object): "pinyin": _(u"Pinyin"), } romanized = ("korean_r", "pinyin") + j_readings = ("ja_on", "ja_kun") readings = mapdict(xml2text, self._get_reading_nodes()) pieces = [] for rt in rtypes: @@ -177,8 +178,11 @@ class Kanjidic2Node(object): elif rt in d: if rt not in readings: continue + r_list = readings[rt] + if rt in j_readings: + r_list = map(jstring_convert, r_list) separator = u", " if rt in romanized else u"、" - reading_str = separator.join(readings[rt]) + reading_str = separator.join(r_list) pieces.append(_(u"%s: %s") % (d[rt], reading_str)) return pieces diff --git a/jbparse/jbparse/kanjidic_common.py b/jbparse/jbparse/kanjidic_common.py index e118c09..1f085b6 100644 --- a/jbparse/jbparse/kanjidic_common.py +++ b/jbparse/jbparse/kanjidic_common.py @@ -33,12 +33,12 @@ This module is not intended to be used by itself. """ -def jstring_convert(us): +def jstring_convert(s): """Convert's from Jim Breen's -x.xx- notation to 〜x(xx)〜 notation.""" - if us[0] == u'-' or us[-1] == u'-': - us = us.replace(u'-', u'〜') - parts = us.split('.', 1) - if len(parts) == 1: return us + s = s.replace(u'-', u'〜') + parts = s.split(u'.', 1) + if len(parts) == 1: + return s return u"%s(%s)" % tuple(parts) def kanjidic2_key_to_str(dkey): -- 2.11.4.GIT