null+****@clear*****
null+****@clear*****
2012年 8月 9日 (木) 16:34:13 JST
SHIMODA Hiroshi 2012-08-09 16:34:13 +0900 (Thu, 09 Aug 2012) New Revision: e0e6553daace99bdba7f4b49911cf8a1dff90332 https://github.com/groonga/gcs/commit/e0e6553daace99bdba7f4b49911cf8a1dff90332 Log: isSynonymsTableAvailableSync => hasSynonymsTableSync Modified files: lib/api/2011-02-01/search.js lib/database/domain.js test/api-configuration.test.js test/database-domain.test.js Modified: lib/api/2011-02-01/search.js (+1 -1) =================================================================== --- lib/api/2011-02-01/search.js 2012-08-09 16:29:55 +0900 (3419252) +++ lib/api/2011-02-01/search.js 2012-08-09 16:34:13 +0900 (7dba611) @@ -125,7 +125,7 @@ exports.createHandler = function(context) { match_columns: matchColumns }; - if (domain.isSynonymsTableAvailableSync()) { + if (domain.hasSynonymsTableSync()) { options.query_expansion = domain.synonymsTableName + '.synonyms'; } if (filter) { Modified: lib/database/domain.js (+3 -3) =================================================================== --- lib/database/domain.js 2012-08-09 16:29:55 +0900 (6a132b4) +++ lib/database/domain.js 2012-08-09 16:34:13 +0900 (5a8d0cf) @@ -256,7 +256,7 @@ Domain.prototype = { if (!this.context) throw new Error('no context'); - if (!this.isSynonymsTableAvailableSync()) + if (!this.hasSynonymsTableSync()) return {}; var options = { @@ -292,7 +292,7 @@ Domain.prototype = { }, setupBlankSynonymsTable: function() { - if (this.isSynonymsTableAvailableSync()) { + if (this.hasSynonymsTableSync()) { this.context.commandSync('table_remove', { table: this.synonymsTableName }); @@ -311,7 +311,7 @@ Domain.prototype = { }); }, - isSynonymsTableAvailableSync: function() { + hasSynonymsTableSync: function() { var tables = this.context.tableListSync(); return tables.some(function(table) { return table.name === this.synonymsTableName; Modified: test/api-configuration.test.js (+2 -2) =================================================================== --- test/api-configuration.test.js 2012-08-09 16:29:55 +0900 (5e0527b) +++ test/api-configuration.test.js 2012-08-09 16:34:13 +0900 (770a566) @@ -777,14 +777,14 @@ suite('Configuration API', function() { }) .next(function() { domain = new Domain('companies', context); - assert.isFalse(domain.isSynonymsTableAvailableSync()); + assert.isFalse(domain.hasSynonymsTableSync()); }) .get('/?Version=2011-02-01&Action=UpdateSynonymOptions&' + 'DomainName=companies&Synonyms='+synonyms, { 'Host': 'cloudsearch.localhost' }) .next(function(response) { - assert.isTrue(domain.isSynonymsTableAvailableSync()); + assert.isTrue(domain.hasSynonymsTableSync()); response = toParsedResponse(response); assert.deepEqual(response.pattern, Modified: test/database-domain.test.js (+2 -2) =================================================================== --- test/database-domain.test.js 2012-08-09 16:29:55 +0900 (da77da7) +++ test/database-domain.test.js 2012-08-09 16:34:13 +0900 (ee0ad96) @@ -304,13 +304,13 @@ suite('database', function() { test('updateSynonymsSync', function() { var domain = new Domain('companies', context); - assert.isFalse(domain.isSynonymsTableAvailableSync()); + assert.isFalse(domain.hasSynonymsTableSync()); domain.updateSynonymsSync({ tokio: ['tokyo'], dekkaido: 'hokkaido' }); - assert.isTrue(domain.isSynonymsTableAvailableSync()); + assert.isTrue(domain.hasSynonymsTableSync()); var dumpExpected = 'table_create ' + domain.synonymsTableName + ' ' + -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download