Navigation Menu

Skip to content

Commit

Permalink
Return blank facet for "nofacet" fields
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 24, 2012
1 parent ef6b1be commit 7f52af3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 13 deletions.
4 changes: 2 additions & 2 deletions lib/api/2011-02-01/search.js
Expand Up @@ -168,10 +168,10 @@ exports.createHandler = function(context) {
hit: data,
elapsedTime: elapsedTime
});
if (selectQuery.facets && selectQuery.facets.length) {
if (selectQuery.facets.length) {
var facetsObject = {};
facets.forEach(function(facet, index) {
var facetName = selectQuery.facets[index];
var facetName = selectQuery.availableFacets[index];
facetsObject[facetName] = facet;
});
result.facets = facetsObject;
Expand Down
29 changes: 18 additions & 11 deletions lib/select-query.js
Expand Up @@ -144,6 +144,21 @@ SelectQuery.prototype = {
}, this)
},

get availableFacets() {
if (this._availableFacets === undefined)
this._availableFacets = this.prepareAvailableFacets();
return this._availableFacets;
},
prepareAvailableFacets: function() {
var facetReturnableFields = this.domain.facetReturnableIndexFields
.map(function(field) {
return field.name;
});
return this.facets.filter(function(field) {
return facetReturnableFields.indexOf(field) > -1;
});
},

get emptyFacets() {
if (this._emptyFacets === undefined)
this._emptyFacets = this.prepareEmptyFacets();
Expand All @@ -167,17 +182,9 @@ SelectQuery.prototype = {
return this._drilldownColumns;
},
prepareDrilldownColumns: function() {
var facetReturnableFields = this.domain.facetReturnableIndexFields
.map(function(field) {
return field.name;
});
return this.facets
.filter(function(field) {
return facetReturnableFields.indexOf(field) > -1;
})
.map(function(field) {
return this.domain.getIndexField(field).columnName;
}, this);
return this.availableFacets.map(function(field) {
return this.domain.getIndexField(field).columnName;
}, this);
},

get outputColumns() {
Expand Down

0 comments on commit 7f52af3

Please sign in to comment.