Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +01:00
Code Issues Packages Projects Releases Activity

fix incorrect removal of attribute filter from string, fixes #35

Browse Source
This commit is contained in:
azivner
2018-02-05 22:25:25 -05:00
parent 23a2b58b24
commit 0a9a032daa
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/api/notes.js
View File

@@ -58,10 +58,16 @@ router.put('/:noteId', auth.checkApiAuth, wrap(async (req, res, next) => {
})); }));
router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => { router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => {
console.log("Search: ", req.query.search);
let {attrFilters, searchText} = parseFilters(req.query.search); let {attrFilters, searchText} = parseFilters(req.query.search);
console.log(attrFilters);
const {query, params} = getSearchQuery(attrFilters, searchText); const {query, params} = getSearchQuery(attrFilters, searchText);
console.log(query, params);
const noteIds = await sql.getColumn(query, params); const noteIds = await sql.getColumn(query, params);
res.send(noteIds); res.send(noteIds);
@@ -72,8 +78,12 @@ function parseFilters(searchText) {
const attrRegex = /(\b(and|or)\s+)?@(!?)([\w_-]+|"[^"]+")((=|!=|<|<=|>|>=)([\w_-]+|"[^"]+"))?/i; const attrRegex = /(\b(and|or)\s+)?@(!?)([\w_-]+|"[^"]+")((=|!=|<|<=|>|>=)([\w_-]+|"[^"]+"))?/i;
console.log("attrRegex", attrRegex);
let match = attrRegex.exec(searchText); let match = attrRegex.exec(searchText);
console.log("Match: ", match);
function trimQuotes(str) { return str.startsWith('"') ? str.substr(1, str.length - 2) : str; } function trimQuotes(str) { return str.startsWith('"') ? str.substr(1, str.length - 2) : str; }
while (match != null) { while (match != null) {
@@ -88,7 +98,7 @@ function parseFilters(searchText) {
}); });
// remove attributes from further fulltext search // remove attributes from further fulltext search
searchText = searchText.replace(new RegExp(match[0], 'g'), ''); searchText = searchText.split(match[0]).join('');
match = attrRegex.exec(searchText); match = attrRegex.exec(searchText);
} }