gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

search refactorings

Browse Source
This commit is contained in:
azivner 2018-06-05 19:12:52 -04:00
parent bd913a63a8
commit 45d9c7164c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/api/autocomplete.js
View File

@ -1,11 +1,11 @@
"use strict"; "use strict";
const autocompleteService = require('../../services/note_cache'); const noteCacheService = require('../../services/note_cache');
async function getAutocomplete(req) { async function getAutocomplete(req) {
const query = req.query.query; const query = req.query.query;
const results = autocompleteService.findNotes(query); const results = noteCacheService.findNotes(query);
return results.map(res => { return results.map(res => {
return { return {

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

@ -2,8 +2,7 @@
const sql = require('../../services/sql'); const sql = require('../../services/sql');
const noteService = require('../../services/notes'); const noteService = require('../../services/notes');
const autocompleteService = require('../../services/note_cache'); const noteCacheService = require('../../services/note_cache');
const utils = require('../../services/utils');
const parseFilters = require('../../services/parse_filters'); const parseFilters = require('../../services/parse_filters');
const buildSearchQuery = require('../../services/build_search_query'); const buildSearchQuery = require('../../services/build_search_query');
@ -21,13 +20,13 @@ async function searchNotes(req) {
let searchTextResults = null; let searchTextResults = null;
if (searchText.trim().length > 0) { if (searchText.trim().length > 0) {
searchTextResults = autocompleteService.findNotes(searchText); searchTextResults = noteCacheService.findNotes(searchText);
let fullTextNoteIds = await getFullTextResults(searchText); let fullTextNoteIds = await getFullTextResults(searchText);
for (const noteId of fullTextNoteIds) { for (const noteId of fullTextNoteIds) {
if (!searchTextResults.some(item => item.noteId === noteId)) { if (!searchTextResults.some(item => item.noteId === noteId)) {
const result = autocompleteService.getNotePath(noteId); const result = noteCacheService.getNotePath(noteId);
if (result) { if (result) {
searchTextResults.push(result); searchTextResults.push(result);
@ -42,7 +41,7 @@ async function searchNotes(req) {
results = labelFiltersNoteIds.filter(item => searchTextResults.includes(item.noteId)); results = labelFiltersNoteIds.filter(item => searchTextResults.includes(item.noteId));
} }
else if (labelFiltersNoteIds) { else if (labelFiltersNoteIds) {
results = labelFiltersNoteIds.map(autocompleteService.getNotePath).filter(res => !!res); results = labelFiltersNoteIds.map(noteCacheService.getNotePath).filter(res => !!res);
} }
else { else {
results = searchTextResults; results = searchTextResults;
@ -56,7 +55,8 @@ async function getFullTextResults(searchText) {
const tokenSql = ["1=1"]; const tokenSql = ["1=1"];
for (const token of tokens) { for (const token of tokens) {
tokenSql.push(`content LIKE '%${token}%'`); // FIXME: escape token!
tokenSql.push(`(title LIKE '%${token}%' OR content LIKE '%${token}%')`);
} }
const noteIds = await sql.getColumn(` const noteIds = await sql.getColumn(`
@ -74,7 +74,7 @@ async function saveSearchToNote(req) {
searchString: req.params.searchString searchString: req.params.searchString
}; };
const {note} = await noteService.createNote('root', 'Search note', noteContent, { const {note} = await noteService.createNote('root', req.params.searchString, noteContent, {
json: true, json: true,
type: 'search', type: 'search',
mime: "application/json" mime: "application/json"