Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 标点符号不纳入虚拟引用和提及搜索 https://github.com/siyuan-note/siyuan/issues/6272

Browse source
This commit is contained in:
Liang Ding 2022-10-20 00:58:54 +08:00
parent a70dfc8b20
commit f5cc328a9b
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/backlink.go
View file

@ -716,6 +716,7 @@ func buildTreeBackmention(defSQLBlock *sql.Block, refBlocks []*Block, keyword st
for _, v := range set.Values() {
mentionKeywords = append(mentionKeywords, v.(string))
}
mentionKeywords = prepareMarkKeywords(mentionKeywords)
ret = searchBackmention(mentionKeywords, keyword, excludeBacklinkIDs, rootID, beforeLen)
return
}
@ -726,9 +727,6 @@ func searchBackmention(mentionKeywords []string, keyword string, excludeBacklink
if 1 > len(mentionKeywords) {
return
}
sort.SliceStable(mentionKeywords, func(i, j int) bool {
return len(mentionKeywords[i]) < len(mentionKeywords[j])
})
table := "blocks_fts" // 大小写敏感
if !Conf.Search.CaseSensitive {

1
kernel/model/file.go
View file

@ -615,6 +615,7 @@ func GetDoc(startID, endID, id string, index int, keyword string, mode int, size
// 虚拟引用排除当前文档名 https://github.com/siyuan-note/siyuan/issues/4537
virtualBlockRefKeywords = gulu.Str.ExcludeElem(virtualBlockRefKeywords, []string{tree.Root.IALAttr("title")})
virtualBlockRefKeywords = prepareMarkKeywords(virtualBlockRefKeywords)
}
subTree := &parse.Tree{ID: rootID, Root: &ast.Node{Type: ast.NodeDocument}, Marks: tree.Marks}

18
kernel/model/search.go
View file

@ -19,6 +19,7 @@ package model
import (
"bytes"
"path"
"sort"
"strconv"
"strings"
"time"
@ -641,7 +642,24 @@ func stringQuery(query string) string {
return strings.TrimSpace(buf.String())
}
func prepareMarkKeywords(keywords []string) (ret []string) {
keywords = gulu.Str.RemoveDuplicatedElem(keywords)
for _, k := range keywords {
if strings.ContainsAny(k, "?*!@#$%^&()[]{}\\|;:'\",.<>~`") {
continue
}
ret = append(ret, k)
}
sort.SliceStable(ret, func(i, j int) bool {
return len(ret[i]) < len(ret[j])
})
return
}
func markReplaceSpan(text string, keywords []string, replacementStart, replacementEnd string) (ret string) {
// 调用该函数前参数 keywords 必须使用 prepareMarkKeywords 函数进行预处理
parts := strings.Split(text, " ")
for i, part := range parts {
if "" == part {