0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve block ref searching https://github.com/siyuan-note/siyuan/issues/12010

Browse source
This commit is contained in:
Daniel 2024-07-24 12:07:40 +08:00
parent e652434858
commit afcb666892
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/model/search.go
View file

@ -322,8 +322,9 @@ func SearchRefBlock(id, rootID, keyword string, beforeLen int, isSquareBrackets,
if "" == keyword {
// 查询为空时默认的块引排序规则按最近使用优先 https://github.com/siyuan-note/siyuan/issues/3218
typeFilter := Conf.Search.TypeFilter()
ignoreLines := getRefSearchIgnoreLines()
refs := sql.QueryRefsRecent(onlyDoc, ignoreLines)
refs := sql.QueryRefsRecent(onlyDoc, typeFilter, ignoreLines)
var btsID []string
for _, ref := range refs {
btsID = append(btsID, ref.DefBlockRootID)

5
kernel/sql/block_ref_query.go
View file

@ -360,12 +360,11 @@ func QueryRefIDsByDefID(defID string, containChildren bool) (refIDs, refTexts []
return
}
func QueryRefsRecent(onlyDoc bool, ignoreLines []string) (ret []*Ref) {
stmt := "SELECT * FROM refs AS r"
func QueryRefsRecent(onlyDoc bool, typeFilter string, ignoreLines []string) (ret []*Ref) {
stmt := "SELECT r.* FROM refs AS r, blocks AS b WHERE b.id = r.def_block_id AND b.type IN " + typeFilter
if onlyDoc {
stmt = "SELECT r.* FROM refs AS r, blocks AS b WHERE b.type = 'd' AND b.id = r.def_block_id"
}
stmt += " WHERE 1 = 1"
if 0 < len(ignoreLines) {
// Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089
buf := bytes.Buffer{}