From 13c12f9bd39636c52f7eb8faa074f5035082f3e4 Mon Sep 17 00:00:00 2001 From: lzwdgc Date: Thu, 23 Jan 2020 21:20:29 +0300 Subject: [PATCH] Update for string changes. --- src/db_add_language/db_add_language.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/db_add_language/db_add_language.cpp b/src/db_add_language/db_add_language.cpp index de085d1..8488146 100644 --- a/src/db_add_language/db_add_language.cpp +++ b/src/db_add_language/db_add_language.cpp @@ -54,12 +54,12 @@ int get_cp(const std::string &cp) struct string_index { - std::wstring s; + P4String s; polygon4::detail::IdType i = -1; void setString(const std::string &rhs, int cp) { - s = str2utf16(rhs, cp); + s = to_string(str2utf16(rhs, cp)); } }; @@ -180,7 +180,7 @@ AimKVResolved get_kv_resolved(const path &d, const polygon4::Storage &storage) std::cout << "total kvs: " << ++i << "/" << sz << "\n"; std::map m; for (auto &s : storage.strings) - m[levenshtein_distance(kv.second.s, s.second->string.ru)] = s.first; + m[levenshtein_distance(kv.second.s, s.second->string.ru)] = s.first; if (m.empty()) return; kv.second.i = m.begin()->second; @@ -235,7 +235,7 @@ void process_lang(polygon4::Storage &s, const path &p, polygon4::String polygon4 if (i == kv_resolved.end()) continue; auto &sold = s.strings[i->second]->string.*field; - auto d = levenshtein_distance(sold, kv.second.s); + auto d = levenshtein_distance(sold, kv.second.s); dist.insert({ d, kv.first }); //if (d == 0) // continue; @@ -260,10 +260,10 @@ void process_lang(polygon4::Storage &s, const path &p, polygon4::String polygon4 str += "kd: " + std::to_string(d2.first) + "\n"; str += "key: " + i->first + "\n\n"; str += "old:\n"; - str += wstring2string(sold) + "\n"; + str += sold + "\n"; str += "\n"; str += "new:\n"; - str += wstring2string(kv.second.s) + "\n"; + str += kv.second.s + "\n"; str += "\n================================================\n\n"; } /*for (auto &kv : kvm)