summaryrefslogtreecommitdiffstats
path: root/src/Database.cc
diff options
context:
space:
mode:
authorPeng Huang <shawn.p.huang@gmail.com>2010-05-20 11:07:30 +0800
committerPeng Huang <shawn.p.huang@gmail.com>2010-05-20 11:07:30 +0800
commitd52ce00ad6718933db0df16451a8ea0a9e15e505 (patch)
tree55f461686f653e686bbaba544f016c5cce4f5aff /src/Database.cc
parentdb8a93b8dfce99abfd827f34d20abbeff2538d7b (diff)
downloadibus-libpinyin-d52ce00ad6718933db0df16451a8ea0a9e15e505.tar.gz
ibus-libpinyin-d52ce00ad6718933db0df16451a8ea0a9e15e505.tar.xz
ibus-libpinyin-d52ce00ad6718933db0df16451a8ea0a9e15e505.zip
Adjust Phrase struct
Diffstat (limited to 'src/Database.cc')
-rw-r--r--src/Database.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Database.cc b/src/Database.cc
index 3467072..1ca23b4 100644
--- a/src/Database.cc
+++ b/src/Database.cc
@@ -149,8 +149,8 @@ Query::fill (PhraseArray &phrases, gint count)
phrase.len = m_pinyin_len;
for (guint i = 0, column = DB_COLUMN_S0; i < m_pinyin_len; i++) {
- phrase.pinyin_id[i][0] = m_stmt->columnInt (column++);
- phrase.pinyin_id[i][1] = m_stmt->columnInt (column++);
+ phrase.pinyin_id[i].sheng = m_stmt->columnInt (column++);
+ phrase.pinyin_id[i].yun = m_stmt->columnInt (column++);
}
phrases.push_back (phrase);
@@ -537,11 +537,11 @@ inline void
Database::phraseWhereSql (const Phrase & p, String & sql)
{
sql << " WHERE";
- sql << " s0=" << p.pinyin_id[0][0]
- << " AND y0=" << p.pinyin_id[0][1];
+ sql << " s0=" << p.pinyin_id[0].sheng
+ << " AND y0=" << p.pinyin_id[0].yun;
for (guint i = 1; i < p.len; i++) {
- sql << " AND s" << i << '=' << p.pinyin_id[i][0]
- << " AND y" << i << '=' << p.pinyin_id[i][1];
+ sql << " AND s" << i << '=' << p.pinyin_id[i].sheng
+ << " AND y" << i << '=' << p.pinyin_id[i].yun;
}
sql << " AND phrase=\"" << p.phrase << "\"";
@@ -556,7 +556,7 @@ Database::phraseSql (const Phrase & p, String & sql)
<< ',' << p.freq; /* freq */
for (guint i = 0; i < p.len; i++) {
- sql << ',' << p.pinyin_id[i][0] << ',' << p.pinyin_id[i][1];
+ sql << ',' << p.pinyin_id[i].sheng << ',' << p.pinyin_id[i].yun;
}
sql << ");\n";