Yoji Shidara
null+****@clear*****
Wed Aug 28 14:44:52 JST 2013
Yoji Shidara 2013-08-28 14:44:52 +0900 (Wed, 28 Aug 2013) New Revision: 8b966ebafcd72ab209b260bc13f15bb4fbdc208a https://github.com/droonga/express-droonga/commit/8b966ebafcd72ab209b260bc13f15bb4fbdc208a Message: Fix message format to fill 'condition' attribute Modified files: lib/adapter/api/rest-request-builder.js test/adapter/rest.test.js test/rest-request-builder.test.js Modified: lib/adapter/api/rest-request-builder.js (+9 -4) =================================================================== --- lib/adapter/api/rest-request-builder.js 2013-08-22 18:11:06 +0900 (fb4db0f) +++ lib/adapter/api/rest-request-builder.js 2013-08-28 14:44:52 +0900 (d92a309) @@ -22,6 +22,7 @@ function searchRequestBuilder(request) { var queryParams = request.query; var queries = {}; + var condition = {}; queries.result = { source: params.tableName, output: { @@ -42,14 +43,18 @@ function searchRequestBuilder(request) { } if (typeof queryParams.limit == 'string') queries.result.output.limit = getIntegerValue(queryParams, 'limit'); + if (typeof queryParams.match_escalation_threshold == 'string') - queries.result.matchEscalationThreshold = getIntegerValue(queryParams, 'match_escalation_threshold'); + condition.matchEscalationThreshold = getIntegerValue(queryParams, 'match_escalation_threshold'); if (typeof queryParams.match_to == 'string') - queries.result.matchTo = queryParams.match_to.split(','); + condition.matchTo = queryParams.match_to.split(','); + if (typeof queryParams.query == 'string') + condition.query = queryParams.query; + if (Object.keys(condition).length > 0) + queries.result.condition = condition; + if (typeof queryParams.offset == 'string') queries.result.offset = getIntegerValue(queryParams, 'offset'); - if (typeof queryParams.query == 'string') - queries.result.query = queryParams.query; if (typeof queryParams.sort_by == 'string') queries.result.sortBy = queryParams.sort_by.split(','); Modified: test/adapter/rest.test.js (+3 -1) =================================================================== --- test/adapter/rest.test.js 2013-08-22 18:11:06 +0900 (0f46f89) +++ test/adapter/rest.test.js 2013-08-28 14:44:52 +0900 (1003a74) @@ -199,7 +199,9 @@ suite('HTTP Adapter', function() { queries: { result: { source: 'foo', - query: 'bar', + condition: { + query: 'bar' + }, output: { elements: utils.allElements, attributes: [] Modified: test/rest-request-builder.test.js (+7 -3) =================================================================== --- test/rest-request-builder.test.js 2013-08-22 18:11:06 +0900 (c6e6421) +++ test/rest-request-builder.test.js 2013-08-28 14:44:52 +0900 (40b959a) @@ -19,7 +19,9 @@ suite('building message from REST adapter request', function() { queries: { result: { source: 'test_table', - query: 'foobar', + condition: { + query: 'foobar' + }, output: { elements: utils.allElements, attributes: [] @@ -51,9 +53,11 @@ suite('building message from REST adapter request', function() { queries: { result: { source: 'people', - query: 'foobar', + condition: { + query: 'foobar', + matchTo: ['realname', 'nickname'], + }, offset: 10, - matchTo: ['realname', 'nickname'], sortBy: ['-realname', '-nickname'], output: { attributes: ['realname', 'nickname', 'age', 'job'], -------------- next part -------------- HTML����������������������������...下載
