self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-05 12:50:29 +02:00
Code Issues Releases Activity

All: Fix search filters when language is in Korean or with accents (#3947)

Browse Source
This commit is contained in:
Naveen M V 2020-10-22 16:46:47 +05:30 committed by GitHub
parent a5d7366f94
commit b737ca7471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ReactNativeClient/lib/services/searchengine/SearchEngine.js
View File

@ -577,6 +577,22 @@ class SearchEngine {
keys.push(col); keys.push(col);
} }
//
// The object "allTerms" is used for query construction purposes (this contains all the filter terms)
// Since this is used for the FTS match query, we need to normalize text, title and body terms.
// Note, we're not normalizing terms like tag because these are matched using SQL LIKE operator and so we must preserve their diacritics.
//
// The object "terms" only include text, title, body terms and is used for highlighting.
// By not normalizing the text, title, body in "terms", highlighting still works correctly for words with diacritics.
//
allTerms = allTerms.map(x => {
if (x.name === 'text' || x.name === 'title' || x.name === 'body') {
return Object.assign(x, { value: this.normalizeText_(x.value) });
}
return x;
});
return { return {
termCount: termCount, termCount: termCount,
keys: keys, keys: keys,
@ -635,7 +651,15 @@ class SearchEngine {
// If preferredSearchType is "fts" we auto-detect anyway // If preferredSearchType is "fts" we auto-detect anyway
// because it's not always supported. // because it's not always supported.
const st = scriptType(query); let allTerms = [];
try {
allTerms = filterParser(query);
} catch (error) {
console.warn(error);
}
const textQuery = allTerms.filter(x => x.name === 'text' || x.name == 'title' || x.name == 'body').map(x => x.value).join(' ');
const st = scriptType(textQuery);
if (!Setting.value('db.ftsEnabled') || ['ja', 'zh', 'ko', 'th'].indexOf(st) >= 0) { if (!Setting.value('db.ftsEnabled') || ['ja', 'zh', 'ko', 'th'].indexOf(st) >= 0) {
return SearchEngine.SEARCH_TYPE_BASIC; return SearchEngine.SEARCH_TYPE_BASIC;
@ -653,12 +677,11 @@ class SearchEngine {
fuzzy: Setting.value('db.fuzzySearchEnabled') === 1, fuzzy: Setting.value('db.fuzzySearchEnabled') === 1,
}, options); }, options);
searchString = this.normalizeText_(searchString);
const searchType = this.determineSearchType_(searchString, options); const searchType = this.determineSearchType_(searchString, options);
if (searchType === SearchEngine.SEARCH_TYPE_BASIC) { if (searchType === SearchEngine.SEARCH_TYPE_BASIC) {
// Non-alphabetical languages aren't support by SQLite FTS (except with extensions which are not available in all platforms) // Non-alphabetical languages aren't support by SQLite FTS (except with extensions which are not available in all platforms)
searchString = this.normalizeText_(searchString);
const rows = await this.basicSearch(searchString); const rows = await this.basicSearch(searchString);
const parsedQuery = await this.parseQuery(searchString); const parsedQuery = await this.parseQuery(searchString);
this.processResults_(rows, parsedQuery, true); this.processResults_(rows, parsedQuery, true);