github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 打开自定义属性搜索选项后出现多余搜索结果 Fix https://github.com/siyuan-note/siyuan/issues/7367

Browse Source
This commit is contained in:
Liang Ding 2023-02-15 11:13:02 +08:00
parent b407ff9003
commit b1a78149f2
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/conf/search.go
View File

@ -108,9 +108,6 @@ func (s *Search) NAMFilter(keyword string) string {
if s.Memo { if s.Memo {
buf.WriteString(" OR memo LIKE '%" + keyword + "%'") buf.WriteString(" OR memo LIKE '%" + keyword + "%'")
} }
if s.Custom {
buf.WriteString(" OR ial LIKE '%=%" + keyword + "%'")
}
return buf.String() return buf.String()
} }

16
kernel/model/search.go
View File

@ -683,6 +683,7 @@ func fullTextSearchByFTS(query, boxFilter, pathFilter, typeFilter, orderBy strin
"fcontent, markdown, length, type, subtype, ial, sort, created, updated" "fcontent, markdown, length, type, subtype, ial, sort, created, updated"
stmt := "SELECT " + projections + " FROM " + table + " WHERE " + table + " MATCH '" + columnFilter() + ":(" + query + ")' AND type IN " + typeFilter stmt := "SELECT " + projections + " FROM " + table + " WHERE " + table + " MATCH '" + columnFilter() + ":(" + query + ")' AND type IN " + typeFilter
stmt += boxFilter + pathFilter stmt += boxFilter + pathFilter
stmt += customIALFilter(query)
stmt += " " + orderBy stmt += " " + orderBy
stmt += " LIMIT " + strconv.Itoa(Conf.Search.Limit) stmt += " LIMIT " + strconv.Itoa(Conf.Search.Limit)
blocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit) blocks := sql.SelectBlocksRawStmt(stmt, Conf.Search.Limit)
@ -714,6 +715,7 @@ func fullTextSearchCount(query, boxFilter, pathFilter, typeFilter string) (match
stmt := "SELECT COUNT(id) AS `matches`, COUNT(DISTINCT(root_id)) AS `docs` FROM `" + table + "` WHERE `" + table + "` MATCH '" + columnFilter() + ":(" + query + ")' AND type IN " + typeFilter stmt := "SELECT COUNT(id) AS `matches`, COUNT(DISTINCT(root_id)) AS `docs` FROM `" + table + "` WHERE `" + table + "` MATCH '" + columnFilter() + ":(" + query + ")' AND type IN " + typeFilter
stmt += boxFilter + pathFilter stmt += boxFilter + pathFilter
stmt += customIALFilter(query)
result, _ := sql.Query(stmt) result, _ := sql.Query(stmt)
if 1 > len(result) { if 1 > len(result) {
return return
@ -723,6 +725,20 @@ func fullTextSearchCount(query, boxFilter, pathFilter, typeFilter string) (match
return return
} }
// customIALFilter 用于组装自定义属性过滤条件。
// 打开自定义属性搜索选项后出现多余搜索结果 https://github.com/siyuan-note/siyuan/issues/7367
func customIALFilter(query string) string {
if !Conf.Search.Custom {
return ""
}
reg := strings.TrimPrefix(query, "\"")
reg = strings.TrimSuffix(reg, "\"")
reg = regexp.QuoteMeta(reg)
reg = "custom\\-.*\\=.*" + reg + ".*\""
return " AND ial REGEXP '" + reg + "'"
}
func markSearch(text string, keyword string, beforeLen int) (marked string, score float64) { func markSearch(text string, keyword string, beforeLen int) (marked string, score float64) {
if 0 == len(keyword) { if 0 == len(keyword) {
marked = text marked = text