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

🎨 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-24 00:13:33 +08:00
parent 4d1da7bca8
commit 3ba6dfed83
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
kernel/model/search.go
View file

@ -1279,7 +1279,7 @@ func fullTextSearchByKeyword(query, boxFilter, pathFilter, typeFilter string, or
ret, matchedBlockCount, matchedRootCount = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+query+"'", beforeLen, page, pageSize) ret, matchedBlockCount, matchedRootCount = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+query+"'", beforeLen, page, pageSize)
return return
} }
return fullTextSearchByUnion(query, boxFilter, pathFilter, typeFilter, orderBy, beforeLen, page, pageSize) return fullTextSearchByFTSWithRoot(query, boxFilter, pathFilter, typeFilter, orderBy, beforeLen, page, pageSize)
} }
func fullTextSearchByRegexp(exp, boxFilter, pathFilter, typeFilter, orderBy string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) { func fullTextSearchByRegexp(exp, boxFilter, pathFilter, typeFilter, orderBy string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
@ -1393,7 +1393,7 @@ func fullTextSearchCountByFTS(query, boxFilter, pathFilter, typeFilter string) (
return return
} }
func fullTextSearchByUnion(query, boxFilter, pathFilter, typeFilter, orderBy string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) { func fullTextSearchByFTSWithRoot(query, boxFilter, pathFilter, typeFilter, orderBy string, beforeLen, page, pageSize int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
table := "blocks_fts" // 大小写敏感 table := "blocks_fts" // 大小写敏感
if !Conf.Search.CaseSensitive { if !Conf.Search.CaseSensitive {
table = "blocks_fts_case_insensitive" table = "blocks_fts_case_insensitive"
@ -1417,24 +1417,21 @@ func fullTextSearchByUnion(query, boxFilter, pathFilter, typeFilter, orderBy str
query = strings.ReplaceAll(query, "'", "''") query = strings.ReplaceAll(query, "'", "''")
query = strings.ReplaceAll(query, "\"", "\"\"") query = strings.ReplaceAll(query, "\"", "\"\"")
keywords := strings.Split(query, " ") keywords := strings.Split(query, " ")
likeFilter := "(" var likeFilter string
for i, keyword := range keywords { for i, keyword := range keywords {
likeFilter += "docContent LIKE '%" + keyword + "%'" likeFilter += "docContent LIKE '%" + keyword + "%'"
if i < len(keywords)-1 { if i < len(keywords)-1 {
likeFilter += " AND " likeFilter += " AND "
} }
} }
likeFilter += ")"
dMatchStmt := "SELECT root_id, GROUP_CONCAT(content) AS docContent" + dMatchStmt := "SELECT root_id, GROUP_CONCAT(content) AS docContent" +
" FROM " + table + " WHERE type IN " + typeFilter + boxFilter + pathFilter + ignoreFilter + " FROM " + table + " WHERE type IN " + typeFilter + boxFilter + pathFilter + ignoreFilter +
" GROUP BY root_id HAVING " + likeFilter " GROUP BY root_id HAVING " + likeFilter
cteStmt := "WITH docs AS (" + dMatchStmt + "), blocks AS (" + bMatchStmt + ")" cteStmt := "WITH docs AS (" + dMatchStmt + "), blocks AS (" + bMatchStmt + ")"
docMatchStmt := "SELECT * FROM " + table + " WHERE id IN (SELECT root_id FROM docs)" cteStmt += "\nSELECT * FROM " + table + " WHERE id IN (SELECT id FROM blocks) OR id IN (SELECT root_id FROM docs)"
blockMatchStmt := "SELECT * FROM " + table + " WHERE id IN (SELECT id FROM blocks)" countStmt := cteStmt
unionStmt := cteStmt + "\nSELECT * FROM (" + blockMatchStmt + " UNION ALL " + docMatchStmt + ")" cteStmt += orderBy + " LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa((page-1)*pageSize)
countStmt := unionStmt resultBlocks := sql.SelectBlocksRawStmtNoParse(cteStmt, -1)
unionStmt += orderBy + " LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa((page-1)*pageSize)
resultBlocks := sql.SelectBlocksRawStmtNoParse(unionStmt, -1)
// FTS 高亮 // FTS 高亮
projections := "id, parent_id, root_id, hash, box, path, " + projections := "id, parent_id, root_id, hash, box, path, " +
@ -1465,11 +1462,11 @@ func fullTextSearchByUnion(query, boxFilter, pathFilter, typeFilter, orderBy str
ret = []*Block{} ret = []*Block{}
} }
matchedBlockCount, matchedRootCount = fullTextSearchCountByUnion(countStmt) matchedBlockCount, matchedRootCount = fullTextSearchCountByStmt(countStmt)
return return
} }
func fullTextSearchCountByUnion(stmt string) (matchedBlockCount, matchedRootCount int) { func fullTextSearchCountByStmt(stmt string) (matchedBlockCount, matchedRootCount int) {
stmt = "SELECT COUNT(id) AS `matches`, COUNT(DISTINCT(root_id)) AS `docs` FROM (" + stmt + ")" stmt = "SELECT COUNT(id) AS `matches`, COUNT(DISTINCT(root_id)) AS `docs` FROM (" + stmt + ")"
result, _ := sql.QueryNoLimit(stmt) result, _ := sql.QueryNoLimit(stmt)
if 1 > len(result) { if 1 > len(result) {