Yoji SHIDARA
null+****@clear*****
Tue Dec 25 09:46:35 JST 2012
Yoji SHIDARA 2012-12-25 09:46:35 +0900 (Tue, 25 Dec 2012) New Revision: fa17ec52c4d22e11cd4f014f0ae098d9e430aa4f https://github.com/groonga/gcs-console/commit/fa17ec52c4d22e11cd4f014f0ae098d9e430aa4f Log: Use Endpoint information in domain Modified files: routes/domains.js Modified: routes/domains.js (+7 -10) =================================================================== --- routes/domains.js 2012-12-25 09:24:57 +0900 (c4d5602) +++ routes/domains.js 2012-12-25 09:46:35 +0900 (0661e81) @@ -10,12 +10,6 @@ exports.index = function(req, res) { res.render('index', {action: 'index'}); }; -function domainToEndpoint(configurationEndpoint, domain, type) { - var domainIdComponents = domain.DomainId.split('/'); - - return 'http://' + type + '-' + domainIdComponents[1] + '-' + domainIdComponents[0] + '.' + configurationEndpoint.hostname + ':' + configurationEndpoint.port; -} - function countBytes(string) { string = encodeURIComponent(string); var escapedPartsMatcher = /\%[0-9a-f][0-9a-f]/gi; @@ -30,9 +24,7 @@ function createGcsDocumentService(req, domain) { domainId: domain.DomainId }); var configurationEndpoint = url.parse(req.app.get('endpoint')); - var endpoint = url.parse( - domainToEndpoint(configurationEndpoint, domain, 'doc') - ); + var endpoint = url.parse('http://' + domain.DocService.Endpoint); documentService.host = function() { return endpoint.hostname; @@ -144,7 +136,12 @@ exports.search = function(req, res) { }; var configurationEndpoint = url.parse(req.app.get('endpoint')); - var requestURL = domainToEndpoint(configurationEndpoint, req.domain, 'search') + '/2011-02-01/search?' + querystring.stringify(paramsForSearch); + var requestURL = url.format({ + protocol: 'http', + host: req.domain.SearchService.Endpoint, + pathname: '/2011-02-01/search', + query: paramsForSearch + }); var buffer = ''; var results = null; -------------- next part -------------- HTML����������������������������...Télécharger
