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

🎨 Moving doc search supports multiple keywords separated by spaces https://github.com/siyuan-note/siyuan/issues/12577

Browse source
This commit is contained in:
Daniel 2024-09-24 23:01:01 +08:00
parent dafb42ae14
commit 0cd17327bc
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
kernel/model/file.go
View file

@ -180,10 +180,11 @@ func SearchDocsByKeyword(keyword string, flashcard bool) (ret []map[string]strin
boxes[box.ID] = box
}
keywords := strings.Fields(keyword)
var rootBlocks []*sql.Block
if "" != keyword {
if 0 < len(keywords) {
for _, box := range boxes {
if strings.Contains(box.Name, keyword) {
if util.ContainsSubStr(box.Name, keywords) {
if flashcard {
newFlashcardCount, dueFlashcardCount, flashcardCount := countBoxFlashcard(box.ID, deck, deckBlockIDs)
if 0 < flashcardCount {
@ -195,13 +196,18 @@ func SearchDocsByKeyword(keyword string, flashcard bool) (ret []map[string]strin
}
}
condition := "hpath LIKE '%" + keyword + "%'"
if "" != keyword {
namCondition := Conf.Search.NAMFilter(keyword)
if "" != namCondition {
condition += " " + namCondition
var condition string
for i, k := range keywords {
condition += "(hpath LIKE '%" + k + "%'"
namCondition := Conf.Search.NAMFilter(k)
condition += " " + namCondition
condition += ")"
if i < len(keywords)-1 {
condition += " AND "
}
}
rootBlocks = sql.QueryRootBlockByCondition(condition)
} else {
for _, box := range boxes {