From e7f868db998a495e26167c3406818ba336d6f863 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Sat, 8 Dec 2018 18:25:12 +0000 Subject: [PATCH] better ordering of auto-completion results --- .../net/ktnx/mobileledger/NewTransactionActivity.java | 11 +++++++++-- app/src/main/res/raw/sql_3.sql | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/raw/sql_3.sql diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index f8678040..3e4b73cc 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -198,13 +198,20 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal String[] col_names = {FontsContract.Columns._ID, field}; MatrixCursor c = new MatrixCursor(col_names); - Cursor matches = db.rawQuery(String.format("SELECT %s FROM %s WHERE UPPER(%s) LIKE '%%'||?||'%%' ORDER BY 1;", field, table, field), new String[]{str}); + Cursor matches = db.rawQuery(String.format( + "SELECT %s as a, case when %s_upper LIKE ?||'%%' then 1 " + + "WHEN %s_upper LIKE '%%:'||?||'%%' then 2 " + + "WHEN %s_upper LIKE '%% '||?||'%%' then 3 " + "else 9 end " + + "FROM %s " + "WHERE %s_upper LIKE " + "'%%'||?||'%%' " + + "ORDER BY 2, 1;", field, field, field, field, table, field), + new String[]{str, str, str, str}); try { int i = 0; while (matches.moveToNext()) { String match = matches.getString(0); - Log.d("autocompletion", String.format("match: %s", match)); + int order = matches.getInt(1); + Log.d("autocompletion", String.format("match: %s |%d", match, order)); c.newRow().add(i++).add(match); } } diff --git a/app/src/main/res/raw/sql_3.sql b/app/src/main/res/raw/sql_3.sql new file mode 100644 index 00000000..ceb373ec --- /dev/null +++ b/app/src/main/res/raw/sql_3.sql @@ -0,0 +1,4 @@ +alter table description_history add description_upper varchar; +update description_history set description_upper = upper(description); +alter table accounts add name_upper varchar; +update accounts set name_upper = upper(name); \ No newline at end of file -- 2.39.2