Navigation Menu

Skip to content

Commit

Permalink
search: enable default fields in bq
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Aug 14, 2012
1 parent 259e90a commit ebe3c1b
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions lib/api/2011-02-01/search.js
Expand Up @@ -96,36 +96,32 @@ exports.createHandler = function(context) {
var filters = [];
var matchExpr = "";
var facetParameter = request.query.facet;
var defaultFields = domain.indexFields.filter(function(field) {
return field.type == 'text' && field.searchEnabled;
});
var defaultFieldNames = defaultFields.map(function(field) {
return field.name;
});

if (query) {
var matchIndexFields;
var queryFilters;
var queryAsBooleanQuery;

var queryAsBooleanQuery = translateQueryToBooleanQuery(query);
var translator = new BooleanQueryTranslator(queryAsBooleanQuery);
translator.defaultFieldNames = defaultFieldNames;
try {
queryAsBooleanQuery = translateQueryToBooleanQuery(query);
matchIndexFields = domain.indexFields.filter(function(field) {
return field.type == 'text' && field.searchEnabled;
});
queryFilters = matchIndexFields.map(function(field) {
var translator = new BooleanQueryTranslator(queryAsBooleanQuery);
translator.defaultField = field.columnName;
return "(" + translator.translate() + ")";
});
filters.push(translator.translate());
} catch (error) {
var body = createErrorBody({
rid: dummyRid,
message: 'Invalid q value: ' + (error.message || error)
});
return response.send(body, 400);
}
filters.push(queryFilters.join(" || "));
matchExpr = "(label " + queryAsBooleanQuery + ")";
}

if (booleanQuery) {
var translator = new BooleanQueryTranslator(booleanQuery);
translator.defaultField = "FIXME"
translator.defaultFieldNames = defaultFieldNames;
try {
filters.push(translator.translate());
} catch (error) {
Expand Down

0 comments on commit ebe3c1b

Please sign in to comment.