Navigation Menu

Skip to content

Commit

Permalink
* Specify output_columns option
Browse files Browse the repository at this point in the history
* Use single quotation by default
  • Loading branch information
piroor committed Aug 22, 2012
1 parent 31c95d9 commit 9f3c11c
Showing 1 changed file with 15 additions and 13 deletions.
28 changes: 15 additions & 13 deletions lib/api/2011-02-01/search.js
Expand Up @@ -88,16 +88,16 @@ function createErrorBody(options) {
'cpu-time-ms': 0, // TODO
messages: [
{
severity: "fatal",
code: "",
message: options.message || ""
severity: 'fatal',
code: '',
message: options.message || ''
}
]
};
}

function translateQueryToBooleanQuery(query) {
return "'" + query.replace(/(['\\])/g, "\\$1") + "'";
return "'" + query.replace(/(['\\])/g, '\\$1') + "'";
}

exports.createHandler = function(context) {
Expand All @@ -108,7 +108,7 @@ exports.createHandler = function(context) {
var query = request.query.q || '';
var booleanQuery = request.query.bq || '';
var filters = [];
var matchExpr = "";
var matchExpr = '';
var facetParameter = request.query.facet;

var defaultFields;
Expand Down Expand Up @@ -138,7 +138,7 @@ exports.createHandler = function(context) {
});
return response.send(body, 400);
}
matchExpr = "(label " + queryAsBooleanQuery + ")";
matchExpr = '(label ' + queryAsBooleanQuery + ')';
}

if (booleanQuery) {
Expand All @@ -155,23 +155,25 @@ exports.createHandler = function(context) {
return response.send(body, 400);
}
if (matchExpr.length > 0) {
matchExpr = "(and " + matchExpr + " " + booleanQuery + ")";
matchExpr = '(and ' + matchExpr + ' ' + booleanQuery + ')';
} else {
matchExpr = booleanQuery;
}
}

filters = filters.map(function(filter) {
return "(" + filter + ")";
return '(' + filter + ')';
});
var size = parseInt(request.query.size || '10', 10);
var start = parseInt(request.query.start || '0', 10);
var filter = filters.join(" && ");
var filter = filters.join(' && ');
var outputColumns = '_key, *';
var options = {
table: domain.tableName,
filter: filter,
limit: size,
offset: start,
table: domain.tableName,
filter: filter,
limit: size,
offset: start,
output_columns: outputColumns
};

if (domain.hasSynonymsTableSync()) {
Expand Down

0 comments on commit 9f3c11c

Please sign in to comment.