null+****@clear*****
null+****@clear*****
2012年 7月 13日 (金) 15:48:52 JST
SHIMODA Hiroshi 2012-07-13 15:48:52 +0900 (Fri, 13 Jul 2012) New Revision: 546cc870701e6677f6284838b17a580bd8372383 https://github.com/groonga/gcs/commit/546cc870701e6677f6284838b17a580bd8372383 Log: Define fake domain id in Domain class Modified files: lib/api/2011-02-01/configuration.js lib/database/domain.js Modified: lib/api/2011-02-01/configuration.js (+6 -7) =================================================================== --- lib/api/2011-02-01/configuration.js 2012-07-13 13:59:29 +0900 (4057de2) +++ lib/api/2011-02-01/configuration.js 2012-07-13 15:48:52 +0900 (0360b18) @@ -7,7 +7,6 @@ var dateFormat = require('dateformat'); exports.version = path.basename(__dirname); var XMLNS = 'http://cloudsearch.amazonaws.com/doc/2011-02-01'; -var FAKE_DOMAIN_ID = '00000000000000000000000000'; function createCommonErrorResponse(errorCode, message) { return '<?xml version="1.0"?>\n' + @@ -74,9 +73,9 @@ handlers.CreateDomain = function(context, request, response) { response.contentType('application/xml'); response.send(createCreateDomainResponse({ domainName: domain.name, - domainId: FAKE_DOMAIN_ID, - searchEndpoint: 'search-' + domain.name + '-' + FAKE_DOMAIN_ID + host, - documentsEndpoint: 'doc-' + domain.name + '-' + FAKE_DOMAIN_ID + host, + domainId: domain.id, + searchEndpoint: 'search-' + domain.name + '-' + domain.id + host, + documentsEndpoint: 'doc-' + domain.name + '-' + domain.id + host, created: true, searchableDocumentsCount: 0, searchInstanceCount: 0, @@ -111,9 +110,9 @@ handlers.DeleteDomain = function(context, request, response) { response.contentType('application/xml'); response.send(createDeleteDomainResponse({ domainName: domain.name, - domainId: FAKE_DOMAIN_ID, - searchEndpoint: 'search-' + domain.name + '-' + FAKE_DOMAIN_ID + host, - documentsEndpoint: 'doc-' + domain.name + '-' + FAKE_DOMAIN_ID + host, + domainId: domain.id, + searchEndpoint: 'search-' + domain.name + '-' + domain.id + host, + documentsEndpoint: 'doc-' + domain.name + '-' + domain.id + host, deleted: true, searchableDocumentsCount: 0, searchInstanceCount: 0, Modified: lib/database/domain.js (+8 -0) =================================================================== --- lib/database/domain.js 2012-07-13 13:59:29 +0900 (ab5d07b) +++ lib/database/domain.js 2012-07-13 15:48:52 +0900 (f60b38d) @@ -7,6 +7,10 @@ exports.MAXIMUM_DOMAIN_NAME_LENGTH = 28; exports.INVALID_DOMAIN_NAME_CHARACTER_PATTERN = /[^\-a-z0-9]/g; exports.INVALID_TABLE_NAME_CHARACTER_PATTERN = /[^_a-z0-9]/g; +var FAKE_DOMAIN_ID = + exports.FAKE_DOMAIN_ID = + Domain.FAKE_DOMAIN_ID = '00000000000000000000000000'; + function assertValidDomainName(domain) { if (typeof domain != 'string') throw new Error('domain name must be a string'); @@ -117,6 +121,10 @@ Domain.prototype = { return this._synonymTableName; }, + get id() { + return FAKE_DOMAIN_ID; + }, + createSync: function() { if (!this.context) throw new Error('no context'); -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...下载
