diff options
Diffstat (limited to 'jmdict.cpp')
-rw-r--r-- | jmdict.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -115,7 +115,7 @@ int showEntry(void*, int, char** value, char**) { } cout << endl; - + string sense; db->exec( sql::query("SELECT sense, gloss FROM gloss WHERE lang=%Q AND entry=%s " @@ -161,7 +161,8 @@ void guessLanguage(const std::string& subject) { if (options::source == options::JAPANESE && !isUTF8) options::source = options::JAPANESE_ROMAJI; else if (options::source == options::UNKNOWN) - options::source = isUTF8 ? options::JAPANESE : options::NOT_JAPANESE; + // options::source = isUTF8 ? options::JAPANESE : options::NOT_JAPANESE; + options::source = isUTF8 ? options::JAPANESE : options::UNKNOWN; } int main(int argc, char** argv) @@ -174,14 +175,18 @@ try { } string subject = argv[optind]; db.reset(new sql::db(DICTIONARY_PATH)); - + guessLanguage(subject); if (options::source == options::JAPANESE) fromJapanese(subject); else if (options::source == options::JAPANESE_ROMAJI) fromRomaji(subject); - else + else if (options::source == options::NOT_JAPANESE) toJapanese(subject); + else { + fromRomaji(subject); + toJapanese(subject); + } cout << entries << " match(es) found." << endl; return EXIT_SUCCESS; |