Browse Source

提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>
pull/1788/head
zouap 3 years ago
parent
commit
9c9a968a16
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      routers/search.go

+ 4
- 4
routers/search.go View File

@@ -119,11 +119,11 @@ func searchRepo(ctx *context.Context, TableName string, Key string, Page int, Pa
log.Info("query searchRepo start")
if Key != "" {
boolQ := elastic.NewBoolQuery()
nameQuery := elastic.NewMatchQuery("name", Key).Boost(2).QueryName("f_first")
nameQuery := elastic.NewMatchQuery("name", Key).Boost(1024).QueryName("f_first")
descriptionQuery := elastic.NewMatchQuery("description", Key).Boost(1.5).QueryName("f_second")
topicsQuery := elastic.NewMatchQuery("topics", Key).Boost(1).QueryName("f_third")
boolQ.Should(nameQuery, descriptionQuery, topicsQuery)
res, err := client.Search(TableName).Query(boolQ).Sort(SortBy, ascending).From((Page - 1) * PageSize).Size(PageSize).Do(ctx.Req.Context())
res, err := client.Search(TableName).Query(boolQ).SortBy(elastic.NewScoreSort(), elastic.NewFieldSort(SortBy).Order(ascending)).From((Page - 1) * PageSize).Size(PageSize).Do(ctx.Req.Context())
if err == nil {
result := makeRepoResult(res, Key)
ctx.JSON(200, result)
@@ -134,7 +134,7 @@ func searchRepo(ctx *context.Context, TableName string, Key string, Page int, Pa
} else {
log.Info("query all content.")
//搜索的属性要指定{"timestamp":{"unmapped_type":"date"}}
res, err := client.Search(TableName).Sort(SortBy, ascending).From((Page - 1) * PageSize).Size(PageSize).Do(ctx.Req.Context())
res, err := client.Search(TableName).SortBy(elastic.NewFieldSort(SortBy).Order(ascending)).From((Page - 1) * PageSize).Size(PageSize).Do(ctx.Req.Context())
if err == nil {
result := makeRepoResult(res, "")
ctx.JSON(200, result)
@@ -505,7 +505,7 @@ func searchPR(ctx *context.Context, TableName string, Key string, Page int, Page
ascending := ctx.QueryBool("Ascending")
boolQ := elastic.NewBoolQuery()
if Key != "" {
nameQuery := elastic.NewMatchQuery("name", Key).Boost(2).QueryName("f_first")
nameQuery := elastic.NewMatchQuery("name", Key).Boost(1024).QueryName("f_first")
contentQuery := elastic.NewMatchQuery("content", Key).Boost(1.5).QueryName("f_second")
commentQuery := elastic.NewMatchQuery("comment", Key).Boost(1).QueryName("f_third")
boolQ.Should(nameQuery, contentQuery, commentQuery)


Loading…
Cancel
Save