Fix sdcv on Android cannot handle morphological changes

This commit is contained in:
chrox
2015-04-22 14:27:05 +08:00
parent 932df2a2f9
commit d345f21c39
3 changed files with 13 additions and 7 deletions

View File

@@ -70,12 +70,18 @@ function ReaderDictionary:stardictLookup(word, box)
word = require("util").stripePunctuations(word)
DEBUG("stripped word:", word)
-- escape quotes and other funny characters in word
local std_out = io.popen("./sdcv --utf8-input --utf8-output -nj "
.. ("%q"):format(word) .. " --data-dir " .. self.data_dir, "r")
local results_str = nil
if std_out then
results_str = std_out:read("*all")
std_out:close()
if Device:isAndroid() then
local A = require("android")
results_str = A.stdout("./sdcv", "--utf8-input", "--utf8-output",
"-nj", word, "--data-dir", self.data_dir)
else
local std_out = io.popen("./sdcv --utf8-input --utf8-output -nj "
.. ("%q"):format(word) .. " --data-dir " .. self.data_dir, "r")
if std_out then
results_str = std_out:read("*all")
std_out:close()
end
end
--DEBUG("result str:", word, results_str)
local ok, results = pcall(JSON.decode, results_str)

View File

@@ -27,7 +27,7 @@ A.LOGI("intent file path " .. (file or ""))
pcall(function() dofile("/sdcard/koreader/patch.lua") end)
-- set proper permission for sdcv
io.popen("chmod 755 ./sdcv")
A.execute("chmod", "755", "./sdcv")
-- create fake command-line arguments
arg = {"-d", file or "/sdcard"}