Skip to content

Commit 37b38b2

Browse files
committed
update fields filter
1 parent a945bfb commit 37b38b2

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

libs/es.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,10 @@ function buildSort(parameters) {
350350

351351
function buildFieldsFilter(parameters) {
352352
const { fields } = parameters
353-
let _sourceInclude = []
353+
let _sourceIncludes = []
354354
if (parameters.hasOwnProperty('fields')) {
355355
// if fields parameters supplied at all, start with this initial set, otherwise return all
356-
_sourceInclude = [
356+
_sourceIncludes = [
357357
'id',
358358
'type',
359359
'geometry',
@@ -364,24 +364,24 @@ function buildFieldsFilter(parameters) {
364364
'properties.datetime'
365365
]
366366
}
367-
let _sourceExclude = []
367+
let _sourceExcludes = []
368368
if (fields) {
369369
const { include, exclude } = fields
370370
// Add include fields to the source include list if they're not already in it
371371
if (include && include.length > 0) {
372372
include.forEach((field) => {
373-
if (_sourceInclude.indexOf(field) < 0) {
374-
_sourceInclude.push(field)
373+
if (_sourceIncludes.indexOf(field) < 0) {
374+
_sourceIncludes.push(field)
375375
}
376376
})
377377
}
378378
// Remove exclude fields from the default include list and add them to the source exclude list
379379
if (exclude && exclude.length > 0) {
380-
_sourceInclude = _sourceInclude.filter((field) => !exclude.includes(field))
381-
_sourceExclude = exclude
380+
_sourceIncludes = _sourceIncludes.filter((field) => !exclude.includes(field))
381+
_sourceExcludes = exclude
382382
}
383383
}
384-
return { _sourceInclude, _sourceExclude }
384+
return { _sourceIncludes, _sourceExcludes }
385385
}
386386

387387

@@ -423,12 +423,12 @@ async function search(parameters, index = '*', page = 1, limit = 10) {
423423
}
424424

425425
// disable fields filter for now
426-
const { _sourceInclude, _sourceExclude } = buildFieldsFilter(parameters)
427-
if (_sourceExclude.length > 0) {
428-
searchParams._sourceExclude = _sourceExclude
426+
const { _sourceIncludes, _sourceExcludes } = buildFieldsFilter(parameters)
427+
if (_sourceExcludes.length > 0) {
428+
searchParams._sourceExcludes = _sourceExcludes
429429
}
430-
if (_sourceInclude.length > 0) {
431-
searchParams._sourceInclude = _sourceInclude
430+
if (_sourceIncludes.length > 0) {
431+
searchParams._sourceIncludes = _sourceIncludes
432432
}
433433

434434
logger.info(`Elasticsearch query: ${JSON.stringify(searchParams)}`)

0 commit comments

Comments
 (0)