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

🐛 查找替换中使用正则表达式后替换不正确 https://github.com/siyuan-note/siyuan/issues/6722

Browse source
This commit is contained in:
Liang Ding 2022-11-28 17:53:41 +08:00
parent 436cab9f68
commit b1741d31de
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/model/search.go
View file

@ -545,7 +545,7 @@ func fullTextSearchByRegexp(exp, box, path, typeFilter string, beforeLen int) (r
exp = gulu.Str.RemoveInvisible(exp) exp = gulu.Str.RemoveInvisible(exp)
fieldFilter := fieldRegexp(exp) fieldFilter := fieldRegexp(exp)
stmt := "SELECT * FROM `blocks` WHERE " + fieldFilter + " AND type IN " + typeFilter stmt := "SELECT * FROM `blocks` WHERE (" + fieldFilter + ") AND type IN " + typeFilter
if "" != box { if "" != box {
stmt += " AND box = '" + box + "'" stmt += " AND box = '" + box + "'"
} }
@ -767,30 +767,30 @@ func fieldRegexp(regexp string) string {
buf := bytes.Buffer{} buf := bytes.Buffer{}
buf.WriteString("content REGEXP '") buf.WriteString("content REGEXP '")
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("' ") buf.WriteString("'")
if Conf.Search.Name { if Conf.Search.Name {
buf.WriteString(" OR name REGEXP '") buf.WriteString(" OR name REGEXP '")
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("' ") buf.WriteString("'")
} }
if Conf.Search.Alias { if Conf.Search.Alias {
buf.WriteString(" OR alias REGEXP '") buf.WriteString(" OR alias REGEXP '")
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("' ") buf.WriteString("'")
} }
if Conf.Search.Memo { if Conf.Search.Memo {
buf.WriteString(" OR memo REGEXP '") buf.WriteString(" OR memo REGEXP '")
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("' ") buf.WriteString("'")
} }
if Conf.Search.Custom { if Conf.Search.Custom {
buf.WriteString(" OR ial REGEXP '") buf.WriteString(" OR ial REGEXP '")
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("' ") buf.WriteString("'")
} }
buf.WriteString(" OR tag REGEXP '") buf.WriteString(" OR tag REGEXP '")
buf.WriteString(regexp) buf.WriteString(regexp)
buf.WriteString("' ") buf.WriteString("'")
return buf.String() return buf.String()
} }