p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/search' into 'main' 

Fix/search

See merge request opensource/answer!151
This commit is contained in:
杨光富 2022-11-01 09:28:39 +00:00
parent 2f277921bb c3f42f1d9e
commit 0dfcc0a3b8
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/repo/search_common/search_repo.go
View File

@ -67,6 +67,9 @@ func NewSearchRepo(data *data.Data, uniqueIDRepo unique.UniqueIDRepo, userCommon
// SearchContents search question and answer data
func (sr *searchRepo) SearchContents(ctx context.Context, words []string, tagID, userID string, votes int, page, size int, order string) (resp []schema.SearchResp, total int64, err error) {
if words = filterWords(words); len(words) == 0 {
return
}
var (
b *builder.Builder
ub *builder.Builder
@ -181,6 +184,9 @@ func (sr *searchRepo) SearchContents(ctx context.Context, words []string, tagID,
// SearchQuestions search question data
func (sr *searchRepo) SearchQuestions(ctx context.Context, words []string, limitNoAccepted bool, answers, page, size int, order string) (resp []schema.SearchResp, total int64, err error) {
if words = filterWords(words); len(words) == 0 {
return
}
var (
qfs = qFields
args = []interface{}{}
@ -259,6 +265,9 @@ func (sr *searchRepo) SearchQuestions(ctx context.Context, words []string, limit
// SearchAnswers search answer data
func (sr *searchRepo) SearchAnswers(ctx context.Context, words []string, limitAccepted bool, questionID string, page, size int, order string) (resp []schema.SearchResp, total int64, err error) {
if words = filterWords(words); len(words) == 0 {
return
}
var (
afs = aFields
args = []interface{}{}
@ -475,3 +484,12 @@ func addRelevanceField(searchFields, words, fields []string) (res []string, args
res = append(res, "("+strings.Join(relevanceRes, " + ")+") as relevance")
return
}
func filterWords(words []string) (res []string) {
for _, word := range words {
if strings.TrimSpace(word) != "" {
res = append(res, word)
}
}
return
}