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

🎨 Global search supports pagination to display results https://github.com/siyuan-note/siyuan/issues/7948

Browse source
This commit is contained in:
Liang Ding 2023-04-21 09:49:13 +08:00
parent 685b7e1383
commit 1eba131624
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
6 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/backlink.go
View file

@ -668,7 +668,7 @@ func searchBackmention(mentionKeywords []string, keyword string, excludeBacklink
buf.WriteString(" ORDER BY id DESC LIMIT " + strconv.Itoa(Conf.Search.Limit)) buf.WriteString(" ORDER BY id DESC LIMIT " + strconv.Itoa(Conf.Search.Limit))
query := buf.String() query := buf.String()
sqlBlocks := sql.SelectBlocksRawStmt(query, Conf.Search.Limit) sqlBlocks := sql.SelectBlocksRawStmt(query, 1, Conf.Search.Limit)
terms := mentionKeywords terms := mentionKeywords
if "" != keyword { if "" != keyword {
terms = append(terms, keyword) terms = append(terms, keyword)

2
kernel/model/export.go
View file

@ -1862,7 +1862,7 @@ func resolveFootnotesDefs(refFootnotes *[]*refAsFootnotes, rootID string, blockR
stmt := n.ChildByType(ast.NodeBlockQueryEmbedScript).TokensStr() stmt := n.ChildByType(ast.NodeBlockQueryEmbedScript).TokensStr()
stmt = html.UnescapeString(stmt) stmt = html.UnescapeString(stmt)
stmt = strings.ReplaceAll(stmt, editor.IALValEscNewLine, "\n") stmt = strings.ReplaceAll(stmt, editor.IALValEscNewLine, "\n")
sqlBlocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) sqlBlocks := sql.SelectBlocksRawStmt(stmt, 1, Conf.Search.Limit)
for _, b := range sqlBlocks { for _, b := range sqlBlocks {
subNodes := renderBlockMarkdownR0(b.ID, &rendered) subNodes := renderBlockMarkdownR0(b.ID, &rendered)
for _, subNode := range subNodes { for _, subNode := range subNodes {

2
kernel/model/render.go
View file

@ -219,7 +219,7 @@ func renderBlockMarkdownR0(id string, rendered *[]string) (ret []*ast.Node) {
stmt := n.ChildByType(ast.NodeBlockQueryEmbedScript).TokensStr() stmt := n.ChildByType(ast.NodeBlockQueryEmbedScript).TokensStr()
stmt = html.UnescapeString(stmt) stmt = html.UnescapeString(stmt)
stmt = strings.ReplaceAll(stmt, editor.IALValEscNewLine, "\n") stmt = strings.ReplaceAll(stmt, editor.IALValEscNewLine, "\n")
sqlBlocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) sqlBlocks := sql.SelectBlocksRawStmt(stmt, 1, Conf.Search.Limit)
for _, sqlBlock := range sqlBlocks { for _, sqlBlock := range sqlBlocks {
subNodes := renderBlockMarkdownR0(sqlBlock.ID, rendered) subNodes := renderBlockMarkdownR0(sqlBlock.ID, rendered)
for _, subNode := range subNodes { for _, subNode := range subNodes {

14
kernel/model/search.go
View file

@ -409,7 +409,7 @@ func FullTextSearchBlock(query string, boxes, paths []string, types map[string]b
pathFilter := buildPathsFilter(paths) pathFilter := buildPathsFilter(paths)
blocks, matchedBlockCount, matchedRootCount = fullTextSearchByQuerySyntax(query, boxFilter, pathFilter, filter, orderByClause, beforeLen, page) blocks, matchedBlockCount, matchedRootCount = fullTextSearchByQuerySyntax(query, boxFilter, pathFilter, filter, orderByClause, beforeLen, page)
case 2: // SQL case 2: // SQL
blocks, matchedBlockCount, matchedRootCount = searchBySQL(query, beforeLen) blocks, matchedBlockCount, matchedRootCount = searchBySQL(query, beforeLen, page)
case 3: // 正则表达式 case 3: // 正则表达式
typeFilter := buildTypeFilter(types) typeFilter := buildTypeFilter(types)
boxFilter := buildBoxesFilter(boxes) boxFilter := buildBoxesFilter(boxes)
@ -600,10 +600,10 @@ func buildTypeFilter(types map[string]bool) string {
return s.TypeFilter() return s.TypeFilter()
} }
func searchBySQL(stmt string, beforeLen int) (ret []*Block, matchedBlockCount, matchedRootCount int) { func searchBySQL(stmt string, beforeLen, page int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
stmt = gulu.Str.RemoveInvisible(stmt) stmt = gulu.Str.RemoveInvisible(stmt)
stmt = strings.TrimSpace(stmt) stmt = strings.TrimSpace(stmt)
blocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) blocks := sql.SelectBlocksRawStmt(stmt, page, Conf.Search.Limit)
ret = fromSQLBlocks(&blocks, "", beforeLen) ret = fromSQLBlocks(&blocks, "", beforeLen)
if 1 > len(ret) { if 1 > len(ret) {
ret = []*Block{} ret = []*Block{}
@ -630,7 +630,7 @@ func fullTextSearchRefBlock(keyword string, beforeLen int, onlyDoc bool) (ret []
keyword = gulu.Str.RemoveInvisible(keyword) keyword = gulu.Str.RemoveInvisible(keyword)
if ast.IsNodeIDPattern(keyword) { if ast.IsNodeIDPattern(keyword) {
ret, _, _ = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+keyword+"'", 36) ret, _, _ = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+keyword+"'", 36, 1)
return return
} }
@ -682,7 +682,7 @@ func fullTextSearchRefBlock(keyword string, beforeLen int, onlyDoc bool) (ret []
func fullTextSearchByQuerySyntax(query, boxFilter, pathFilter, typeFilter, orderBy string, beforeLen, page int) (ret []*Block, matchedBlockCount, matchedRootCount int) { func fullTextSearchByQuerySyntax(query, boxFilter, pathFilter, typeFilter, orderBy string, beforeLen, page int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
query = gulu.Str.RemoveInvisible(query) query = gulu.Str.RemoveInvisible(query)
if ast.IsNodeIDPattern(query) { if ast.IsNodeIDPattern(query) {
ret, matchedBlockCount, matchedRootCount = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+query+"'", beforeLen) ret, matchedBlockCount, matchedRootCount = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+query+"'", beforeLen, page)
return return
} }
return fullTextSearchByFTS(query, boxFilter, pathFilter, typeFilter, orderBy, beforeLen, page) return fullTextSearchByFTS(query, boxFilter, pathFilter, typeFilter, orderBy, beforeLen, page)
@ -691,7 +691,7 @@ func fullTextSearchByQuerySyntax(query, boxFilter, pathFilter, typeFilter, order
func fullTextSearchByKeyword(query, boxFilter, pathFilter, typeFilter string, orderBy string, beforeLen, page int) (ret []*Block, matchedBlockCount, matchedRootCount int) { func fullTextSearchByKeyword(query, boxFilter, pathFilter, typeFilter string, orderBy string, beforeLen, page int) (ret []*Block, matchedBlockCount, matchedRootCount int) {
query = gulu.Str.RemoveInvisible(query) query = gulu.Str.RemoveInvisible(query)
if ast.IsNodeIDPattern(query) { if ast.IsNodeIDPattern(query) {
ret, matchedBlockCount, matchedRootCount = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+query+"'", beforeLen) ret, matchedBlockCount, matchedRootCount = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+query+"'", beforeLen, page)
return return
} }
query = stringQuery(query) query = stringQuery(query)
@ -747,7 +747,7 @@ func fullTextSearchByFTS(query, boxFilter, pathFilter, typeFilter, orderBy strin
stmt += boxFilter + pathFilter stmt += boxFilter + pathFilter
stmt += " " + orderBy stmt += " " + orderBy
stmt += " LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa((page-1)*pageSize) stmt += " LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa((page-1)*pageSize)
blocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) blocks := sql.SelectBlocksRawStmt(stmt, page, Conf.Search.Limit)
ret = fromSQLBlocks(&blocks, "", beforeLen) ret = fromSQLBlocks(&blocks, "", beforeLen)
if 1 > len(ret) { if 1 > len(ret) {
ret = []*Block{} ret = []*Block{}

2
kernel/model/template.go
View file

@ -196,7 +196,7 @@ func renderTemplate(p, id string) (string, error) {
for _, arg := range args { for _, arg := range args {
stmt = strings.Replace(stmt, "?", arg, 1) stmt = strings.Replace(stmt, "?", arg, 1)
} }
ret = sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) ret = sql.SelectBlocksRawStmt(stmt, 1, Conf.Search.Limit)
return return
} }
funcMap["querySpans"] = func(stmt string, args ...string) (ret []*sql.Span) { funcMap["querySpans"] = func(stmt string, args ...string) (ret []*sql.Span) {

11
kernel/sql/block_query.go
View file

@ -417,7 +417,7 @@ func SelectBlocksRawStmtNoParse(stmt string, limit int) (ret []*Block) {
return selectBlocksRawStmt(stmt, limit) return selectBlocksRawStmt(stmt, limit)
} }
func SelectBlocksRawStmt(stmt string, limit int) (ret []*Block) { func SelectBlocksRawStmt(stmt string, page, limit int) (ret []*Block) {
parsedStmt, err := sqlparser.Parse(stmt) parsedStmt, err := sqlparser.Parse(stmt)
if nil != err { if nil != err {
return selectBlocksRawStmt(stmt, limit) return selectBlocksRawStmt(stmt, limit)
@ -433,6 +433,15 @@ func SelectBlocksRawStmt(stmt string, limit int) (ret []*Block) {
Val: []byte(strconv.Itoa(limit)), Val: []byte(strconv.Itoa(limit)),
}, },
} }
} else {
slct.Limit.Rowcount = &sqlparser.SQLVal{
Type: sqlparser.IntVal,
Val: []byte(strconv.Itoa(limit)),
}
slct.Limit.Offset = &sqlparser.SQLVal{
Type: sqlparser.IntVal,
Val: []byte(strconv.Itoa((page - 1) * 32)),
}
} }
stmt = sqlparser.String(slct) stmt = sqlparser.String(slct)