better ordering of auto-completion results

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index f86780408206b050bfeee566593619d7aeabf50d..3e4b73ccc2b7e2da4c132cd45fd3fae611f3cc2c 100644 (file)
--- 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 (file)
index 0000000..ceb373e
--- /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