YUKI Hiroshi
null+****@clear*****
Thu Oct 18 16:02:18 JST 2012
YUKI Hiroshi 2012-10-18 16:02:18 +0900 (Thu, 18 Oct 2012) New Revision: 3715095932afe6e02aa7654feec4bd2fd9f548ee https://github.com/groonga/gcs/commit/3715095932afe6e02aa7654feec4bd2fd9f548ee Log: Don't return index field status for not-existing fields by DescribeIndexFields Modified files: lib/api/2011-02-01/configuration.js Modified: lib/api/2011-02-01/configuration.js (+20 -22) =================================================================== --- lib/api/2011-02-01/configuration.js 2012-10-18 15:54:22 +0900 (1efaeac) +++ lib/api/2011-02-01/configuration.js 2012-10-18 16:02:18 +0900 (d688b6b) @@ -11,12 +11,17 @@ exports.version = path.basename(__dirname); var XMLNS = 'http://cloudsearch.amazonaws.com/doc/2011-02-01'; function createCommonErrorResponse(errorCode, error) { + if (error.message) { + error = error.message + '\n' + error.stack; + } else { + error = error.toString(); + } var doc = xmlbuilder.create(); doc.begin('Response', { version: '1.0' }) .element('Errors') .element('Error') .element('Code').text(errorCode).up() - .element('Message').text((error.message || error).toString()).up() + .element('Message').text(error).up() .up() .up() .element('RequestID').text(uuid.v4()).up(); @@ -121,8 +126,7 @@ handlers.DeleteDomain = function(context, request, response, config) { response.contentType('application/xml'); response.send(createGenericResponse('DeleteDomain', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -164,8 +168,7 @@ handlers.DescribeDomains = function(context, request, response, config) { response.contentType('application/xml'); response.send(createGenericResponse('DescribeDomains', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -270,8 +273,7 @@ handlers.DefineIndexField = function(context, request, response, config) { response.contentType('application/xml'); response.send(createGenericResponse('DefineIndexField', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -287,8 +289,7 @@ handlers.DeleteIndexField = function(context, request, response, config) { response.contentType('application/xml'); response.send(createGenericResponse('DeleteIndexField')); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -318,15 +319,17 @@ handlers.DescribeIndexFields = function(context, request, response, config) { }); var fields = fieldNames.length ? fieldNames.map(function(name) { - return domain.getIndexField(name); + var field = domain.getIndexField(name); + return field.exists() ? field : null ; + }).filter(function(field) { + return field; }) : domain.indexFields ; var result = createIndexFields(fields); response.contentType('application/xml'); response.send(createGenericResponse('DescribeIndexFields', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -357,8 +360,7 @@ handlers.IndexDocuments = function(context, request, response, config) { response.contentType('application/xml'); response.send(createGenericResponse('IndexDocuments', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -397,8 +399,7 @@ handlers.UpdateSynonymOptions = function(context, request, response, config) { response.contentType('application/xml'); response.send(createGenericResponse('UpdateSynonymOptions', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -416,8 +417,7 @@ handlers.DescribeSynonymOptions = function(context, request, response, config) { response.contentType('application/xml'); response.send(createGenericResponse('DescribeSynonymOptions', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -452,8 +452,7 @@ handlers.UpdateDefaultSearchField = function(context, request, response, config) response.contentType('application/xml'); response.send(createGenericResponse('UpdateDefaultSearchField', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } @@ -472,8 +471,7 @@ handlers.DescribeDefaultSearchField = function(context, request, response, confi response.contentType('application/xml'); response.send(createGenericResponse('DescribeDefaultSearchField', result)); } catch (error) { - var body = createCommonErrorResponse('InternalFailure', - (error.message || error).toString()); + var body = createCommonErrorResponse('InternalFailure', error); response.contentType('application/xml'); response.send(body, 400); } -------------- next part -------------- HTML����������������������������... Download