Try to fix dictionary auto-selection.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 01d0a3cb094ef51647934dc6d629ff99856df915..28c5b6f2fb6d2d0b2a38b580f386900ddda9c75c 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -332,7 +332,7 @@ public class DictionaryActivity extends ActionBarActivity {
         /**
          * @author Dominik Köppl If no dictionary is chosen, use the default
          *         dictionary specified in the preferences If this step does
-         *         fail (no default directory specified), show a toast and
+         *         fail (no default dictionary specified), show a toast and
          *         abort.
          */
         if (intent.getStringExtra(C.DICT_FILE) == null)
@@ -353,26 +353,35 @@ public class DictionaryActivity extends ActionBarActivity {
             for (int i = 0; dictFilename == null && i < dics.size(); ++i)
             {
                 try {
-                    final String fname = dics.get(i).uncompressedFilename;
-                    Dictionary dic = new Dictionary(new RandomAccessFile(new File(fname), "r"));
+                    Log.d(LOG, "Checking dictionary " + dics.get(i).uncompressedFilename);
+                    final File dictfile = application.getPath(dics.get(i).uncompressedFilename);
+                    Dictionary dic = new Dictionary(new RandomAccessFile(dictfile, "r"));
                     for (int j = 0; j < dic.indices.size(); ++j) {
                         Index idx = dic.indices.get(j);
+                        Log.d(LOG, "Checking index " + idx.shortName);
                         if (idx.findExact(search) != null)
                         {
-                            dictFilename = fname;
+                            Log.d(LOG, "Found exact match");
+                            dictFilename = dictfile.toString();
                             intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
                             break;
                         }
                         int matchLen = getMatchLen(search, idx.findInsertionPoint(search, dummy));
+                        Log.d(LOG, "Found partial match length " + matchLen);
                         if (matchLen > bestMatchLen)
                         {
-                            dictFilename = fname;
-                            intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+                            bestFname = dictfile.toString();
+                            bestIndex = idx.shortName;
                             bestMatchLen = matchLen;
                         }
                     }
                 } catch (Exception e) {}
             }
+            if (dictFilename == null && bestFname != null)
+            {
+                dictFilename = bestFname;
+                intent.putExtra(C.INDEX_SHORT_NAME, bestIndex);
+            }
         }
 
         if (dictFilename == null)