kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-07 22:31:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Android full text search works with split ZIM files #269

Browse Source
This commit is contained in:
mhutti1 2016-08-30 20:49:01 +01:00
parent 1eecb29471
commit 95884d8cbd
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -13,6 +13,7 @@ FIXED: Failing he, id, yi locales
FIXED: Non-localised setting language list sorting FIXED: Non-localised setting language list sorting
FIXED: Multiple search history problems FIXED: Multiple search history problems
FIXED: Crashes with 'Twillight' app FIXED: Crashes with 'Twillight' app
FIXED: Full text search with split ZIM files
1.99 1.99
FIXED: ZIM load error on ICS FIXED: ZIM load error on ICS

12
src/org/kiwix/kiwixmobile/views/AutoCompleteAdapter.java
View File

@ -78,6 +78,14 @@ public class AutoCompleteAdapter extends ArrayAdapter<String> implements Filtera
data.add("A/" + toAdd + ".html"); data.add("A/" + toAdd + ".html");
} }
public String getDbName(String file){
String name = file;
if (!name.substring(name.length() - 3).equals("zim")){
name = name.substring(0, name.length() - 2);
}
return name + ".idk";
}
@Override @Override
protected FilterResults performFiltering(CharSequence constraint) { protected FilterResults performFiltering(CharSequence constraint) {
FilterResults filterResults = new FilterResults(); FilterResults filterResults = new FilterResults();
@ -86,10 +94,10 @@ public class AutoCompleteAdapter extends ArrayAdapter<String> implements Filtera
try { try {
final String prefix = constraint.toString(); final String prefix = constraint.toString();
String qStr = capitalizeQuery(prefix); String qStr = capitalizeQuery(prefix);
String[] result = JNIKiwix.indexedQuery(ZimContentProvider.getZimFile() + ".idx", qStr).split("\n"); String[] result = JNIKiwix.indexedQuery(getDbName(ZimContentProvider.getZimFile()), qStr).split("\n");
if (result.length == 1 && result[0].trim().isEmpty()) { if (result.length == 1 && result[0].trim().isEmpty()) {
result = JNIKiwix.indexedQueryPartial(ZimContentProvider.getZimFile() + ".idx", qStr).split("\n"); result = JNIKiwix.indexedQueryPartial(getDbName(ZimContentProvider.getZimFile()), qStr).split("\n");
} }
if (hasNonEmptyResult(result)) { if (hasNonEmptyResult(result)) {