knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#66,filters,elasticsearch][s]: elasticsearch support for filters (addTermFilter on Query).

Browse Source
This commit is contained in:
Rufus Pollock
2012-04-02 21:05:56 +01:00
parent 36548ceffc
commit 5a73ced225
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/elasticsearch.js
View File

@@ -79,6 +79,19 @@ this.recline.Backend = this.recline.Backend || {};
} }
delete out.q; delete out.q;
} }
// now do filters (note the *plural*)
if (out.filters && out.filters.length) {
if (!out.filter) {
out.filter = {}
}
if (!out.filter.and) {
out.filter.and = [];
}
out.filter.and = out.filter.and.concat(out.filters);
}
if (out.filters != undefined) {
delete out.filters;
}
return out; return out;
}, },
query: function(model, queryObj) { query: function(model, queryObj) {

6
test/backend.elasticsearch.test.js
View File

@@ -20,6 +20,12 @@ test("ElasticSearch queryNormalize", function() {
in_.q = 'abc'; in_.q = 'abc';
var out = backend._normalizeQuery(in_); var out = backend._normalizeQuery(in_);
equal(out.query.query_string.query, 'abc'); equal(out.query.query_string.query, 'abc');
var in_ = new recline.Model.Query();
in_.addTermFilter('xyz', 'XXX');
in_ = in_.toJSON();
var out = backend._normalizeQuery(in_);
deepEqual(out.filter.and[0], {term: { xyz: 'XXX'}});
}); });
var mapping_data = { var mapping_data = {