Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

update search

aichy126a93668d45514
diff --git a/internal/repo/search_common/search_repo.go b/internal/repo/search_common/search_repo.go
index dc07e5ae..da32503c 100644
--- a/internal/repo/search_common/search_repo.go
+++ b/internal/repo/search_common/search_repo.go
@@ -103,26 +103,21 @@ func (sr *searchRepo) SearchContents(ctx context.Context, words []string, tagIDs
argsQ = append(argsQ, entity.QuestionStatusDeleted, entity.QuestionShow)
argsA = append(argsA, entity.QuestionStatusDeleted, entity.AnswerStatusDeleted, entity.QuestionShow)
- for i, word := range words {
- if i == 0 {
- b.Where(builder.Like{"title", word}).
- Or(builder.Like{"original_text", word})
- argsQ = append(argsQ, "%"+word+"%")
- argsQ = append(argsQ, "%"+word+"%")
-
- ub.Where(builder.Like{"`answer`.original_text", word})
- argsA = append(argsA, "%"+word+"%")
- } else {
- b.Or(builder.Like{"title", word}).
- Or(builder.Like{"original_text", word})
- argsQ = append(argsQ, "%"+word+"%")
- argsQ = append(argsQ, "%"+word+"%")
+ likeConQ := builder.NewCond()
+ likeConA := builder.NewCond()
+ for _, word := range words {
+ likeConQ = likeConQ.Or(builder.Like{"title", word}).
+ Or(builder.Like{"original_text", word})
+ argsQ = append(argsQ, "%"+word+"%")
+ argsQ = append(argsQ, "%"+word+"%")
- ub.Or(builder.Like{"`answer`.original_text", word})
- argsA = append(argsA, "%"+word+"%")
- }
+ likeConA = likeConA.Or(builder.Like{"`answer`.original_text", word})
+ argsA = append(argsA, "%"+word+"%")
}
+ b.Where(likeConQ)
+ ub.Where(likeConA)
+
// check tag
if len(tagIDs) > 0 {
for ti, tagID := range tagIDs {
@@ -233,17 +228,14 @@ func (sr *searchRepo) SearchQuestions(ctx context.Context, words []string, tagID
b.Where(builder.Lt{"`question`.`status`": entity.QuestionStatusDeleted}).And(builder.Eq{"`question`.`show`": entity.QuestionShow})
args = append(args, entity.QuestionStatusDeleted, entity.QuestionShow)
- for i, word := range words {
- if i == 0 {
- b.Where(builder.Like{"title", word}).
- Or(builder.Like{"original_text", word})
- args = append(args, "%"+word+"%")
- args = append(args, "%"+word+"%")
- } else {
- b.Or(builder.Like{"original_text", word})
- args = append(args, "%"+word+"%")
- }
+ likeConQ := builder.NewCond()
+ for _, word := range words {
+ likeConQ = likeConQ.Or(builder.Like{"title", word}).
+ Or(builder.Like{"original_text", word})
+ args = append(args, "%"+word+"%")
+ args = append(args, "%"+word+"%")
}
+ b.Where(likeConQ)
// check tag
if len(tagIDs) > 0 {
@@ -348,16 +340,14 @@ func (sr *searchRepo) SearchAnswers(ctx context.Context, words []string, tagIDs
And(builder.Lt{"`answer`.`status`": entity.AnswerStatusDeleted}).And(builder.Eq{"`question`.`show`": entity.QuestionShow})
args = append(args, entity.QuestionStatusDeleted, entity.AnswerStatusDeleted, entity.QuestionShow)
- for i, word := range words {
- if i == 0 {
- b.Where(builder.Like{"`answer`.original_text", word})
- args = append(args, "%"+word+"%")
- } else {
- b.Or(builder.Like{"`answer`.original_text", word})
- args = append(args, "%"+word+"%")
- }
+ likeConA := builder.NewCond()
+ for _, word := range words {
+ likeConA = likeConA.Or(builder.Like{"`answer`.original_text", word})
+ args = append(args, "%"+word+"%")
}
+ b.Where(likeConA)
+
// check tag
if len(tagIDs) > 0 {
for ti, tagID := range tagIDs {