Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix search

Browse source
This commit is contained in:
Victor Shcherb 2018-04-04 12:21:54 +02:00
parent 04df3d987c
commit 4452d61a05
1 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
OsmAnd/src/net/osmand/plus/wikivoyage/data/WikivoyageDbHelper.java
View file

@ -2,7 +2,6 @@ package net.osmand.plus.wikivoyage.data;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import net.osmand.Collator; import net.osmand.Collator;
import net.osmand.CollatorStringMatcher; import net.osmand.CollatorStringMatcher;
import net.osmand.CollatorStringMatcher.StringMatcherMode; import net.osmand.CollatorStringMatcher.StringMatcherMode;
@ -62,20 +61,7 @@ public class WikivoyageDbHelper {
private static final String SEARCH_COL_ARTICLE_TITLE = "article_title"; private static final String SEARCH_COL_ARTICLE_TITLE = "article_title";
private static final String SEARCH_COL_LANG = "lang"; private static final String SEARCH_COL_LANG = "lang";
private static final String SEARCH_QUERY = "SELECT DISTINCT " + ;
SEARCH_TABLE_NAME + "." + SEARCH_COL_CITY_ID + ", " +
SEARCH_COL_ARTICLE_TITLE + ", " +
SEARCH_TABLE_NAME + "." + SEARCH_COL_LANG + ", " +
ARTICLES_COL_IS_PART_OF + ", " +
ARTICLES_COL_IMAGE_TITLE +
" FROM " + SEARCH_TABLE_NAME +
" JOIN " + ARTICLES_TABLE_NAME +
" ON " + SEARCH_TABLE_NAME + "." + SEARCH_COL_ARTICLE_TITLE + " = " + ARTICLES_TABLE_NAME + "." + ARTICLES_COL_TITLE +
" AND " + SEARCH_TABLE_NAME + "." + SEARCH_COL_LANG + " = " + ARTICLES_TABLE_NAME + "." + ARTICLES_COL_LANG +
" WHERE " + SEARCH_TABLE_NAME + "." + SEARCH_COL_CITY_ID +
" IN (SELECT " + SEARCH_TABLE_NAME + "." + SEARCH_COL_CITY_ID +
" FROM " + SEARCH_TABLE_NAME +
" WHERE " + SEARCH_COL_SEARCH_TERM + " LIKE ?)";
private final OsmandApplication application; private final OsmandApplication application;
@ -90,13 +76,42 @@ public class WikivoyageDbHelper {
public List<WikivoyageSearchResult> search(final String searchQuery) { public List<WikivoyageSearchResult> search(final String searchQuery) {
List<WikivoyageSearchResult> res = new ArrayList<>(); List<WikivoyageSearchResult> res = new ArrayList<>();
SQLiteConnection conn = openConnection(); SQLiteConnection conn = openConnection();
String[] queries= searchQuery.replace('_', ' ').replace('/', ' ').split(" " );
if (conn != null) { if (conn != null) {
try { try {
SQLiteCursor cursor = conn.rawQuery(SEARCH_QUERY, new String[]{searchQuery + "%"}); List<String> params = new ArrayList<String>();
if (cursor.moveToFirst()) { String query = "SELECT distinct wa.city_id, wa.title, wa.lang, wa.is_part_of, wa.image_title " +
do { "FROM wikivoyage_articles wa WHERE wa.city_id in " +
res.add(readSearchResult(cursor)); " (SELECT city_id FROM wikivoyage_search WHERE search_term LIKE";
} while (cursor.moveToNext()); for(int i = 0; i < queries.length; i++) {
if(queries[i].trim().length() > 0) {
if(params.size() > 5) {
// don't explode the query search much
break;
}
if(params.size() > 0) {
query += " AND city_id IN (SELECT city_id FROM wikivoyage_search WHERE search_term LIKE ?) ";
} else {
query += "?";
}
params.add(queries[i].trim() +"%");
}
}
query +=") ";
if (params.size() > 0) {
SQLiteCursor cursor = conn.rawQuery(query, params.toArray(new String[params.size()]));
if (cursor.moveToFirst()) {
do {
WikivoyageSearchResult rs = new WikivoyageSearchResult();
rs.cityId = cursor.getLong(0);
rs.articleTitles.add(cursor.getString(1));
rs.langs.add(cursor.getString(2));
rs.isPartOf = cursor.getString(3);
rs.imageTitle = cursor.getString(4);
res.add(rs);
} while (cursor.moveToNext());
}
} }
} finally { } finally {
conn.close(); conn.close();
@ -104,6 +119,12 @@ public class WikivoyageDbHelper {
} }
List<WikivoyageSearchResult> list = new ArrayList<>(groupSearchResultsByCityId(res)); List<WikivoyageSearchResult> list = new ArrayList<>(groupSearchResultsByCityId(res));
sortSearchResults(searchQuery, list);
return list;
}
private void sortSearchResults(final String searchQuery, List<WikivoyageSearchResult> list) {
Collections.sort(list, new Comparator<WikivoyageSearchResult>() { Collections.sort(list, new Comparator<WikivoyageSearchResult>() {
@Override @Override
public int compare(WikivoyageSearchResult o1, WikivoyageSearchResult o2) { public int compare(WikivoyageSearchResult o1, WikivoyageSearchResult o2) {
@ -121,8 +142,6 @@ public class WikivoyageDbHelper {
return 0; return 0;
} }
}); });
return list;
} }
private Collection<WikivoyageSearchResult> groupSearchResultsByCityId(List<WikivoyageSearchResult> res) { private Collection<WikivoyageSearchResult> groupSearchResultsByCityId(List<WikivoyageSearchResult> res) {
@ -177,19 +196,6 @@ public class WikivoyageDbHelper {
return application.getSQLiteAPI().openByAbsolutePath(path, true); return application.getSQLiteAPI().openByAbsolutePath(path, true);
} }
@NonNull
private WikivoyageSearchResult readSearchResult(SQLiteCursor cursor) {
WikivoyageSearchResult res = new WikivoyageSearchResult();
res.cityId = cursor.getLong(0);
res.articleTitles.add(cursor.getString(1));
res.langs.add(cursor.getString(2));
res.isPartOf = cursor.getString(3);
res.imageTitle = cursor.getString(4);
return res;
}
@NonNull @NonNull
private WikivoyageArticle readArticle(SQLiteCursor cursor) { private WikivoyageArticle readArticle(SQLiteCursor cursor) {
WikivoyageArticle res = new WikivoyageArticle(); WikivoyageArticle res = new WikivoyageArticle();