github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-04 02:11:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Improve search highlighting https://github.com/siyuan-note/siyuan/issues/13343

Browse Source
This commit is contained in:
Daniel 2024-12-07 11:54:30 +08:00
parent 96c59433e2
commit 08e3b6b82f
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/api/filetree.go
View File

@ -1120,7 +1120,7 @@ func getDoc(c *gin.Context) {
highlight = highlightArg.(bool) highlight = highlightArg.(bool)
} }
blockCount, content, parentID, parent2ID, rootID, typ, eof, scroll, boxID, docPath, isBacklinkExpand, err := blockCount, content, parentID, parent2ID, rootID, typ, eof, scroll, boxID, docPath, isBacklinkExpand, keywords, err :=
model.GetDoc(startID, endID, id, index, query, queryTypes, queryMethod, mode, size, isBacklink, highlight) model.GetDoc(startID, endID, id, index, query, queryTypes, queryMethod, mode, size, isBacklink, highlight)
if model.ErrBlockNotFound == err { if model.ErrBlockNotFound == err {
ret.Code = 3 ret.Code = 3
@ -1151,6 +1151,7 @@ func getDoc(c *gin.Context) {
"path": docPath, "path": docPath,
"isSyncing": isSyncing, "isSyncing": isSyncing,
"isBacklinkExpand": isBacklinkExpand, "isBacklinkExpand": isBacklinkExpand,
"keywords": keywords,
} }
} }

4
kernel/model/file.go
View File

@ -599,7 +599,8 @@ func StatTree(id string) (ret *util.BlockStatResult) {
} }
} }
func GetDoc(startID, endID, id string, index int, query string, queryTypes map[string]bool, queryMethod, mode int, size int, isBacklink, highlight bool) (blockCount int, dom, parentID, parent2ID, rootID, typ string, eof, scroll bool, boxID, docPath string, isBacklinkExpand bool, err error) { func GetDoc(startID, endID, id string, index int, query string, queryTypes map[string]bool, queryMethod, mode int, size int, isBacklink, highlight bool) (
blockCount int, dom, parentID, parent2ID, rootID, typ string, eof, scroll bool, boxID, docPath string, isBacklinkExpand bool, keywords []string, err error) {
//os.MkdirAll("pprof", 0755) //os.MkdirAll("pprof", 0755)
//cpuProfile, _ := os.Create("pprof/GetDoc") //cpuProfile, _ := os.Create("pprof/GetDoc")
//pprof.StartCPUProfile(cpuProfile) //pprof.StartCPUProfile(cpuProfile)
@ -800,7 +801,6 @@ func GetDoc(startID, endID, id string, index int, query string, queryTypes map[s
subTree := &parse.Tree{ID: rootID, Root: &ast.Node{Type: ast.NodeDocument}, Marks: tree.Marks} subTree := &parse.Tree{ID: rootID, Root: &ast.Node{Type: ast.NodeDocument}, Marks: tree.Marks}
var keywords []string
if "" != query && (0 == queryMethod || 1 == queryMethod || 3 == queryMethod) { // 只有关键字、查询语法和正则表达式搜索支持高亮 if "" != query && (0 == queryMethod || 1 == queryMethod || 3 == queryMethod) { // 只有关键字、查询语法和正则表达式搜索支持高亮
if 0 == queryMethod { if 0 == queryMethod {
query = stringQuery(query) query = stringQuery(query)