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

renaming/refactoring of search services

Browse Source
This commit is contained in:
azivner
2018-06-04 19:48:02 -04:00
parent 76c0e5b2b8
commit 015cd68756
7 changed files with 15 additions and 24 deletions
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";
const autocompleteService = require('../../services/autocomplete');
const autocompleteService = require('../../services/note_cache');
async function getAutocomplete(req) {
const query = req.query.query;
const results = autocompleteService.getResults(query);
const results = autocompleteService.findNotes(query);
return results.map(res => {
return {

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

@@ -2,7 +2,7 @@
const sql = require('../../services/sql');
const noteService = require('../../services/notes');
const autocompleteService = require('../../services/autocomplete');
const autocompleteService = require('../../services/note_cache');
const utils = require('../../services/utils');
const parseFilters = require('../../services/parse_filters');
const buildSearchQuery = require('../../services/build_search_query');
@@ -21,13 +21,13 @@ async function searchNotes(req) {
let searchTextResults = null;
if (searchText.trim().length > 0) {
searchTextResults = autocompleteService.getResults(searchText);
searchTextResults = autocompleteService.findNotes(searchText);
let fullTextNoteIds = await getFullTextResults(searchText);
for (const noteId of fullTextNoteIds) {
if (!searchTextResults.some(item => item.noteId === noteId)) {
const result = autocompleteService.getResult(noteId);
const result = autocompleteService.getNotePath(noteId);
if (result) {
searchTextResults.push(result);
@@ -42,7 +42,7 @@ async function searchNotes(req) {
results = labelFiltersNoteIds.filter(item => searchTextResults.includes(item.noteId));
}
else if (labelFiltersNoteIds) {
results = labelFiltersNoteIds.map(autocompleteService.getResult).filter(res => !!res);
results = labelFiltersNoteIds.map(autocompleteService.getNotePath).filter(res => !!res);
}
else {
results = searchTextResults;