diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2010-05-17 10:41:11 +0800 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2010-05-17 10:41:11 +0800 |
| commit | 51438d761eb28fc9c19efc7eef82681ebdc86e65 (patch) | |
| tree | e4376d04599181443cfd85c12c9c9edc8c6794b4 /src/Database.cc | |
| parent | 28d811bfa3676d1f96ec7b366caedececb6cc60b (diff) | |
| parent | c5aefb2ca27010474d12032f51be840c92ed4770 (diff) | |
| download | ibus-libpinyin-51438d761eb28fc9c19efc7eef82681ebdc86e65.tar.gz ibus-libpinyin-51438d761eb28fc9c19efc7eef82681ebdc86e65.tar.xz ibus-libpinyin-51438d761eb28fc9c19efc7eef82681ebdc86e65.zip | |
Merge branch 'bopomofo'
Conflicts:
ibus-pinyin.spec.in
Diffstat (limited to 'src/Database.cc')
| -rw-r--r-- | src/Database.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Database.cc b/src/Database.cc index ea56786..ff560c6 100644 --- a/src/Database.cc +++ b/src/Database.cc @@ -514,7 +514,7 @@ Database::query (const PinyinArray &pinyin, m_sql.clear (); gint id = pinyin_len - 1; m_sql << "SELECT * FROM (" - "SELECT 0 AS user_freq, * FROM main.py_phrase_" << id << " WHERE " << m_buffer<< " UNION ALL " + "SELECT 0 AS user_freq, * FROM main.py_phrase_" << id << " WHERE " << m_buffer << " UNION ALL " "SELECT * FROM userdb.py_phrase_" << id << " WHERE " << m_buffer << ") " "GROUP BY phrase ORDER BY user_freq DESC, freq DESC"; if (m > 0) @@ -554,9 +554,11 @@ Database::phraseSql (const Phrase & p, String & sql) << " VALUES(" << 0 /* user_freq */ << ",\"" << p.phrase << '"' /* phrase */ << ',' << p.freq; /* freq */ - for (guint i = 0; i < p.len; i++) { - sql << ',' << p.pinyin_id[i][0] << ',' << p.pinyin_id[i][1]; - } + + for (guint i = 0; i < p.len; i++) { + sql << ',' << p.pinyin_id[i][0] << ',' << p.pinyin_id[i][1]; + } + sql << ");\n"; sql << "UPDATE userdb.py_phrase_" << p.len - 1 |