Add back simple codes (originally called short codes)

closes #6

Signed-off-by: Keng-Yu Lin <kengyu@lexical.tw>

Author: Keng-Yu Lin

data/array.db

@@ -28,15 +28,15 @@
 REGION_UNIFIED_ExtCD = 4
 REGION_UNIFIED_ExtE  = 5
 REGION_UNIFIED_ExtF  = 6
-REGION_ARRAY_SIMPLE  = 7
+REGION_ARRAY_SYMBOL  = 7
 
 STR_UNIFIED_ExtA  = "CJK Unified Ideographs + Extension A"
 STR_ARRAY_SPECIAL = "Array30 Special Code"
 STR_UNIFIED_ExtB  = "CJK Unified Ideographs Extension B"
 STR_UNIFIED_ExtCD = "CJK Unified Ideographs Extension C & D"
 STR_UNIFIED_ExtE  = "CJK Unified Ideographs Extension E"
 STR_UNIFIED_ExtF  = "CJK Unified Ideographs Extension F"
-STR_ARRAY_SIMPLE  = "CJK Symbols & Punctuation for Array30 input method (w+0~9)"
+STR_ARRAY_SYMBOL  = "CJK Symbols & Punctuation for Array30 input method (w+0~9)"
 
 REG_STACK = []
 

data/array30_simplecode.cin

@@ -26,5 +26,6 @@
 con = sqlite.connect(argv[1])
 cur = con.cursor()
 cur.execute('DELETE FROM main;')
+cur.execute('DELETE FROM simple;')
 con.commit()
 con.close()

data/cin2sqlite.py

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from pysqlite2 import dbapi2 as sqlite
+
+def array_updatedb(table_file, table):
+	con = sqlite.connect("array.db")
+	cur = con.cursor()
+	cur.execute('select * from ' + table)
+	tbl = cur.fetchall()
+
+	# read from the text table
+	f = open(table_file, 'r')
+	z = map(lambda x:x.split('\t'), filter(lambda k:(k[0] != '#' and k[0] != '%' and len(k.strip()) != 0), f.readlines()))
+	k = map(lambda y:(y[0].lower(), y[1].strip(' \n')), z)
+	f.close()
+
+	# update the database
+	for i, j in k:
+		cur.execute('INSERT INTO ' + table + ' (keys, ch) VALUES ("' + i + '", "' + j + '");')
+
+	con.commit()
+	con.close()
+
+# empty tables
+con = sqlite.connect("array.db")
+cur = con.cursor()
+cur.execute('DELETE FROM simple;')
+con.commit()
+con.close()
+
+array_updatedb('array30_simplecode.cin', 'simple')

data/emptyDB.py

@@ -138,14 +138,14 @@ GArray* array_get_candidates_from_main(ArrayContext *context, gchar *keys) {
     return result;
 }
 
-GArray* array_get_candidates_from_short(ArrayContext *context, gchar *keys) {
+GArray* array_get_candidates_from_simple(ArrayContext *context, gchar *keys) {
     GArray *result;
     result = (GArray*)g_array_new(FALSE, FALSE, sizeof(gchar*));
 
     sqlite3_stmt *stmt;
 
     int retcode;
-    retcode = sqlite3_prepare_v2(context->conn, "SELECT ch FROM short WHERE keys=?", -1, &stmt, NULL);
+    retcode = sqlite3_prepare_v2(context->conn, "SELECT ch FROM simple WHERE keys=?", -1, &stmt, NULL);
     if (retcode == SQLITE_OK) {
         sqlite3_bind_text(stmt, 1, keys, -1, SQLITE_TRANSIENT);
         while (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -167,7 +167,7 @@ GArray* array_get_candidates_from_special(ArrayContext *context, gchar *keys) {
     sqlite3_stmt *stmt;
 
     int retcode;
-    retcode = sqlite3_prepare_v2(context->conn, "SELECT ch FROM special WHERE keys=?", -1, &stmt, NULL);
+    retcode = sqlite3_prepare_v2(context->conn, "SELECT ch FROM main WHERE cat='2' AND keys=?", -1, &stmt, NULL);
     if (retcode == SQLITE_OK) {
         sqlite3_bind_text(stmt, 1, keys, -1, SQLITE_TRANSIENT);
         while (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -189,7 +189,7 @@ GArray* array_get_reverted_key_candidates_from_special(ArrayContext *context, gc
     sqlite3_stmt *stmt;
 
     int retcode;
-    retcode = sqlite3_prepare_v2(context->conn, "SELECT keys FROM special WHERE ch=?", -1, &stmt, NULL);
+    retcode = sqlite3_prepare_v2(context->conn, "SELECT keys FROM main WHERE cat='2' AND ch=?", -1, &stmt, NULL);
     if (retcode == SQLITE_OK) {
         sqlite3_bind_text(stmt, 1, ch, -1, SQLITE_TRANSIENT);
         while (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -211,7 +211,7 @@ GArray* array_get_reverted_char_candidates_from_special(ArrayContext *context, g
     sqlite3_stmt *stmt;
 
     int retcode;
-    retcode = sqlite3_prepare_v2(context->conn, "SELECT ch FROM special WHERE keys=?", -1, &stmt, NULL);
+    retcode = sqlite3_prepare_v2(context->conn, "SELECT ch FROM main WHERE cat='2' AND keys=?", -1, &stmt, NULL);
     if (retcode == SQLITE_OK) {
         sqlite3_bind_text(stmt, 1, keys, -1, SQLITE_TRANSIENT);
         while (sqlite3_step(stmt) == SQLITE_ROW) {

data/updateSimple.py

@@ -33,7 +33,7 @@ ArrayContext* array_create_context();
 void array_release_context(ArrayContext *context);
 GString* array_get_preedit_string(GString *preedit);
 GArray* array_get_candidates_from_main(ArrayContext *context, gchar *keys);
-GArray* array_get_candidates_from_short(ArrayContext *context, gchar *keys);
+GArray* array_get_candidates_from_simple(ArrayContext *context, gchar *keys);
 GArray* array_get_candidates_from_special(ArrayContext *context, gchar *keys);
 GArray* array_get_reverted_key_candidates_from_special(ArrayContext *context, gchar *ch);
 GArray* array_get_reverted_char_candidates_from_special(ArrayContext *context, gchar *keys);

src/array.c

@@ -267,7 +267,7 @@ static void ibus_array_engine_update_lookup_table (IBusArrayEngine *arrayeng) {
     GArray *candidates = NULL;
 
     if (arrayeng->preedit->len <= 2 && arrayeng->space_press_count == 0)
-        candidates = array_get_candidates_from_short(array_context, arrayeng->preedit->str);
+        candidates = array_get_candidates_from_simple(array_context, arrayeng->preedit->str);
     else
         candidates = array_get_candidates_from_main(array_context, arrayeng->preedit->str);