Mercurial > hg > lxmldump
diff lxmldump.py @ 56:71e66eca1e23
Merge.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 27 May 2021 16:55:22 +0300 |
parents | 301452a71cc7 884770576e74 |
children | 4410e2d1bff3 |
line wrap: on
line diff
--- a/lxmldump.py Thu May 27 10:49:44 2021 +0300 +++ b/lxmldump.py Thu May 27 16:55:22 2021 +0300 @@ -43,8 +43,8 @@ pkk_mode_defaults = { # Default Ptr URL format strings "ptr_fmt": { - PKK_MODE_NORMAL: u"<PTR:{href}>{text}</PTR>", - PKK_MODE_ANKI: u"<a href='https://kaino.kotus.fi/cgi-bin/kks/karjala.cgi?a={href}'>{text}</a>", + PKK_MODE_NORMAL: "<PTR:{href}>{text}</PTR>", + PKK_MODE_ANKI: "<a href='https://kaino.kotus.fi/cgi-bin/kks/karjala.cgi?a={href}'>{text}</a>", }, "word_item": { @@ -75,7 +75,6 @@ }, "search_list_item": { PKK_MODE_NORMAL: "\"{text}\"", - PKK_MODE_ANKI: "{text}", }, "search_list_sep": { PKK_MODE_NORMAL: ", ", @@ -110,8 +109,8 @@ }, "example_item": { - PKK_MODE_NORMAL: "{indent}exmp \"{text}\"{geostr}\n", - PKK_MODE_ANKI: " ⚫ \"{text}\"{geostr}", + PKK_MODE_NORMAL: "{indent}exmp \"{text}\"{geo_list}\n", + PKK_MODE_ANKI: " ⚫ \"{text}\"{geo_list}", }, "example_geo_list": { PKK_MODE_NORMAL: " ({alist})", @@ -359,7 +358,7 @@ ostr += pkk_get_fmt("example_item").format( text=pkk_node_to_text(wnode.find("./Example")), - geostr=pkk_get_list_str(geolist, "example_geo", False), + geo_list=pkk_get_list_str(geolist, "example_geo", False), indent=pkk_geti(indent + 1)) return ostr