Skip to content

Commit

Permalink
Merge pull request #229 from geonetwork/search-optimization
Browse files Browse the repository at this point in the history
Improve search by setting priorities on search fields
  • Loading branch information
tkohr authored Feb 24, 2022
2 parents 650994e + 19f7a2b commit 5911d05
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
8 changes: 8 additions & 0 deletions libs/util/shared/src/lib/elasticsearch/constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,11 @@ export const ElasticSearchSources = {
[ElasticsearchMetadataModels.SUMMARY]: ES_SOURCE_SUMMARY,
[ElasticsearchMetadataModels.BRIEF]: ES_SOURCE_BRIEF,
}

export const ES_QUERY_STRING_FIELDS = [
'resourceTitleObject.*^5',
'tag.*^4',
'resourceAbstractObject.*^3',
'lineageObject.*^2',
'any',
]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ElasticsearchService } from './elasticsearch.service'
import { Observable } from 'rxjs'
import { ES_QUERY_STRING_FIELDS } from './constant'

let autocompleteConfig

Expand Down Expand Up @@ -102,6 +103,7 @@ describe('ElasticsearchService', () => {
must: [
{
query_string: {
fields: ES_QUERY_STRING_FIELDS,
query: '(*) AND (tag.default:"world" tag.default:"vector")',
},
},
Expand Down
11 changes: 10 additions & 1 deletion libs/util/shared/src/lib/elasticsearch/elasticsearch.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Injectable } from '@angular/core'
import { Observable } from 'rxjs'
import { map, take } from 'rxjs/operators'
import { ES_QUERY_STRING_FIELDS } from './constant'
import {
EsSearchParams,
EsTemplateType,
Expand Down Expand Up @@ -114,7 +115,15 @@ export class ElasticsearchService {

return {
bool: {
must: [{ query_string: { query } }, this.addTemplateClause('n')],
must: [
{
query_string: {
query,
fields: ES_QUERY_STRING_FIELDS,
},
},
this.addTemplateClause('n'),
],
filter: this.buildPayloadFilter(configFilters),
},
}
Expand Down

0 comments on commit 5911d05

Please sign in to comment.