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

added protected note full text search

Browse Source
This commit is contained in:
zadam
2020-06-20 23:46:49 +02:00
parent 5f699cc28c
commit 56d6384ae1
4 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/search/parser.js
View File

@@ -11,7 +11,8 @@ const PropertyComparisonExp = require('./expressions/property_comparison');
const AttributeExistsExp = require('./expressions/attribute_exists');
const LabelComparisonExp = require('./expressions/label_comparison');
const NoteCacheFulltextExp = require('./expressions/note_cache_fulltext');
const NoteContentFulltextExp = require('./expressions/note_content_fulltext');
const NoteContentProtectedFulltextExp = require('./expressions/note_content_protected_fulltext');
const NoteContentUnprotectedFulltextExp = require('./expressions/note_content_unprotected_fulltext');
const OrderByAndLimitExp = require('./expressions/order_by_and_limit');
const comparatorBuilder = require('./comparator_builder');
const ValueExtractor = require('./value_extractor');
@@ -25,7 +26,8 @@ function getFulltext(tokens, parsingContext) {
else if (parsingContext.includeNoteContent) {
return new OrExp([
new NoteCacheFulltextExp(tokens),
new NoteContentFulltextExp('*=*', tokens)
new NoteContentProtectedFulltextExp('*=*', tokens),
new NoteContentUnprotectedFulltextExp('*=*', tokens)
]);
}
else {
@@ -67,7 +69,10 @@ function getExpression(tokens, parsingContext, level = 0) {
i++;
return new NoteContentFulltextExp(operator, [tokens[i]]);
return new OrExp([
NoteContentUnprotectedFulltextExp(operator, [tokens[i]]),
NoteContentProtectedFulltextExp(operator, [tokens[i]])
]);
}
if (tokens[i] === 'parents') {