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

⚡ Return document blocks when search hits different block content https://github.com/siyuan-note/siyuan/issues/10584

Browse source
This commit is contained in:
Daniel 2024-10-26 23:03:57 +08:00
parent b32257cf1c
commit 655d1fb6b9
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kernel/model/search.go
View file

@ -1386,7 +1386,7 @@ func fullTextSearchByFTSWithRoot(query, boxFilter, pathFilter, typeFilter, ignor
query = strings.ReplaceAll(query, "'", "''")
query = strings.ReplaceAll(query, "\"", "\"\"")
keywords := strings.Split(query, " ")
contentField := "content||tag||name||alias||memo"
contentField := columnConcat()
var likeFilter string
orderByLike := "("
for i, keyword := range keywords {
@ -1404,7 +1404,7 @@ func fullTextSearchByFTSWithRoot(query, boxFilter, pathFilter, typeFilter, ignor
cteStmt := "WITH docBlocks AS (" + dMatchStmt + ")"
likeFilter = strings.ReplaceAll(likeFilter, "GROUP_CONCAT("+contentField+")", "concatContent")
selectStmt := cteStmt + "\nSELECT *, " +
"(content || tag || name || alias || memo) AS concatContent, " +
"(" + contentField + ") AS concatContent, " +
"(SELECT COUNT(root_id) FROM docBlocks) AS docs, " +
"(CASE WHEN (root_id IN (SELECT root_id FROM docBlocks) AND (" + strings.ReplaceAll(likeFilter, "concatContent", contentField) + ")) THEN 1 ELSE 0 END) AS blockSort" +
" FROM blocks WHERE type IN " + typeFilter + boxFilter + pathFilter + ignoreFilter +
@ -1684,6 +1684,25 @@ func columnFilter() string {
return buf.String()
}
func columnConcat() string {
buf := bytes.Buffer{}
buf.WriteString("content")
if Conf.Search.Name {
buf.WriteString("||name")
}
if Conf.Search.Alias {
buf.WriteString("||alias")
}
if Conf.Search.Memo {
buf.WriteString("||memo")
}
if Conf.Search.IAL {
buf.WriteString("||ial")
}
buf.WriteString("||tag")
return buf.String()
}
func stringQuery(query string) string {
if "" == strings.TrimSpace(query) {
return "\"" + query + "\""