Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Code Issues Projects Releases Wiki Activity

fix #1035 by CDATA tidy

Browse Source
This commit is contained in:
chrox 2014-10-28 15:57:01 +08:00
parent 7a22c60256
commit fea7b93b62
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base

@ -1 +1 @@
Subproject commit 1c623700fb4499e4dcb2d56f59319c4be235fe3b
Subproject commit 267cfbd223d6d606329d3f13b6f3b6bd486239eb

21
frontend/apps/reader/modules/readerdictionary.lua
View File

@ -32,6 +32,25 @@ function ReaderDictionary:onLookupWord(word, box, highlight)
return true
end
local function tidyCDATA(results)
local cdata_tag = "<!%[CDATA%[(.-)%]%]>"
local format_escape = "&[29Ib%+]{(.-)}"
for _, result in ipairs(results) do
-- parse CDATA text in XML
if result.definition:find(cdata_tag) then
local def = result.definition:gsub(cdata_tag, "%1")
-- ignore all tags
def = def:gsub("%b<>", "")
-- ignore format strings
while def:find(format_escape) do
def = def:gsub(format_escape, "%1")
end
result.definition = def
end
end
return results
end
function ReaderDictionary:stardictLookup(word, box)
DEBUG("lookup word:", word, box)
if word then
@ -47,7 +66,7 @@ function ReaderDictionary:stardictLookup(word, box)
local ok, results = pcall(JSON.decode, JSON, results_str)
if ok and results then
DEBUG("lookup result table:", word, results)
self:showDict(word, results, box)
self:showDict(word, tidyCDATA(results), box)
else
-- dummy results
results = {