Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split up search terms by whitespaces. Fixes #58

Browse Source
This commit is contained in:
Daniel Martí 2015-03-31 02:13:15 +02:00
parent 60cd63c274
commit db803bfb0c
1 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -498,15 +498,49 @@ public class AppProvider extends FDroidProvider {
return new AppQuerySelection().requireNaturalInstalledTable(); return new AppQuerySelection().requireNaturalInstalledTable();
} }
private AppQuerySelection querySearch(String keywords) { private AppQuerySelection querySearch(String query) {
keywords = "%" + cleanQueryKeywords(keywords) + "%"; final String[] columns = {
String selection = "fdroid_app.id",
"fdroid_app.id like ? OR " + "fdroid_app.name",
"fdroid_app.name like ? OR " + "fdroid_app.summary",
"fdroid_app.summary like ? OR " + "fdroid_app.description",
"fdroid_app.description like ? "; };
return new AppQuerySelection(selection,
new String[] { keywords, keywords, keywords, keywords }); // Remove duplicates, surround in % for case insensitive searching
Set<String> keywordSet = new HashSet<String>(Arrays.asList(query.split("\\s")));
String[] keywords = new String[keywordSet.size()];
int iKeyword = 0;
for (String keyword : keywordSet) {
keywords[iKeyword] = "%" + keyword + "%";
iKeyword++;
}
// Build selection string and fill out keyword arguments
StringBuilder selection = new StringBuilder();
String[] selectionKeywords = new String[columns.length * keywords.length];
iKeyword = 0;
boolean firstColumn = true;
for (final String column : columns) {
if (firstColumn) {
selection.append("(");
firstColumn = false;
} else {
selection.append("OR (");
}
boolean firstKeyword = true;
for (final String keyword : keywords) {
if (firstKeyword) {
selection.append(column + " like ?");
firstKeyword = false;
} else {
selection.append(" OR " + column + " like ?");
}
selectionKeywords[iKeyword] = keyword;
iKeyword++;
}
selection.append(") ");
}
return new AppQuerySelection(selection.toString(), selectionKeywords);
} }
private AppQuerySelection querySingle(String id) { private AppQuerySelection querySingle(String id) {