self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-02-13 19:42:36 +02:00
Code Issues Releases Activity

Chore: Fixed search engine result type

Browse Source
This commit is contained in:
Laurent Cozic 2023-10-25 14:09:26 +01:00
parent b7c85e1930
commit 6392a1e00f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-desktop/plugins/GotoAnything.tsx
View File

@ -307,7 +307,7 @@ class Dialog extends React.PureComponent<Props, State> {
} else { // Note TITLE or BODY } else { // Note TITLE or BODY
listType = BaseModel.TYPE_NOTE; listType = BaseModel.TYPE_NOTE;
searchQuery = gotoAnythingStyleQuery(this.state.query); searchQuery = gotoAnythingStyleQuery(this.state.query);
results = await SearchEngine.instance().search(searchQuery); results = (await SearchEngine.instance().search(searchQuery)) as any[];
resultsInBody = !!results.find((row: any) => row.fields.includes('body')); resultsInBody = !!results.find((row: any) => row.fields.includes('body'));

10
packages/lib/services/searchengine/SearchEngine.ts
View File

@ -29,7 +29,8 @@ interface SearchOptions {
appendWildCards?: boolean; appendWildCards?: boolean;
} }
interface ProcessResultsRow { export interface ProcessResultsRow {
id: string;
offsets: string; offsets: string;
user_updated_time: number; user_updated_time: number;
matchinfo: Buffer; matchinfo: Buffer;
@ -612,7 +613,7 @@ export default class SearchEngine {
return SearchEngine.SEARCH_TYPE_FTS; return SearchEngine.SEARCH_TYPE_FTS;
} }
public async search(searchString: string, options: SearchOptions = null) { public async search(searchString: string, options: SearchOptions = null): Promise<ProcessResultsRow[]> {
if (!searchString) return []; if (!searchString) return [];
options = { options = {
@ -627,7 +628,6 @@ export default class SearchEngine {
if (searchType === SearchEngine.SEARCH_TYPE_BASIC) { if (searchType === SearchEngine.SEARCH_TYPE_BASIC) {
searchString = this.normalizeText_(searchString); searchString = this.normalizeText_(searchString);
const rows = await this.basicSearch(searchString); const rows = await this.basicSearch(searchString);
this.processResults_(rows, parsedQuery, true); this.processResults_(rows, parsedQuery, true);
return rows; return rows;
} else { } else {
@ -654,8 +654,8 @@ export default class SearchEngine {
const useFts = searchType === SearchEngine.SEARCH_TYPE_FTS; const useFts = searchType === SearchEngine.SEARCH_TYPE_FTS;
try { try {
const { query, params } = queryBuilder(parsedQuery.allTerms, useFts); const { query, params } = queryBuilder(parsedQuery.allTerms, useFts);
const rows = await this.db().selectAll(query, params); const rows = (await this.db().selectAll(query, params)) as ProcessResultsRow[];
this.processResults_(rows as ProcessResultsRow[], parsedQuery, !useFts); this.processResults_(rows, parsedQuery, !useFts);
return rows; return rows;
} catch (error) { } catch (error) {
this.logger().warn(`Cannot execute MATCH query: ${searchString}: ${error.message}`); this.logger().warn(`Cannot execute MATCH query: ${searchString}: ${error.message}`);