Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 03:46:37 +01:00
Code Issues Packages Projects Releases Activity

filter reimplementation, WIP

Browse Source
This commit is contained in:
zadam
2019-03-16 16:52:58 +01:00
parent 0885e60b80
commit 2326eb85f1
3 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/routes/api/search.js
View File

@@ -8,54 +8,13 @@ const parseFilters = require('../../services/parse_filters');
const buildSearchQuery = require('../../services/build_search_query');
async function searchNotes(req) {
const {labelFilters, searchText} = parseFilters(req.params.searchString);
const filters = parseFilters(req.params.searchString);
let labelFiltersNoteIds = null;
const {query, params} = buildSearchQuery(filters);
if (labelFilters.length > 0) {
const {query, params} = buildSearchQuery(labelFilters, searchText);
const labelFiltersNoteIds = await sql.getColumn(query, params);
labelFiltersNoteIds = await sql.getColumn(query, params);
}
let searchTextResults = null;
if (searchText.trim().length > 0) {
searchTextResults = await noteCacheService.findNotes(searchText);
let fullTextNoteIds = await getFullTextResults(searchText);
for (const noteId of fullTextNoteIds) {
if (!searchTextResults.some(item => item.noteId === noteId)) {
const result = noteCacheService.getNotePath(noteId);
if (result) {
searchTextResults.push(result);
}
}
}
}
let results;
if (labelFiltersNoteIds && searchTextResults) {
results = searchTextResults.filter(item => labelFiltersNoteIds.includes(item.noteId));
}
else if (labelFiltersNoteIds) {
results = labelFiltersNoteIds.map(noteCacheService.getNotePath).filter(res => !!res);
}
else {
results = searchTextResults;
}
return results;
}
async function getFullTextResults(searchText) {
const safeSearchText = utils.sanitizeSql(searchText);
return await sql.getColumn(`SELECT noteId FROM note_fulltext
WHERE note_fulltext MATCH '${safeSearchText}'`);
return labelFiltersNoteIds.map(noteCacheService.getNotePath).filter(res => !!res);
}
async function saveSearchToNote(req) {