Navigation Menu

Skip to content

Commit

Permalink
Fix handling of index field options
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 13, 2012
1 parent 0fea6b6 commit 1b2aa9d
Showing 1 changed file with 21 additions and 14 deletions.
35 changes: 21 additions & 14 deletions lib/api/2011-02-01/configuration.js
Expand Up @@ -15,7 +15,7 @@ function createCommonErrorResponse(errorCode, error) {
.element('Errors')
.element('Error')
.element('Code').text(errorCode).up()
.element('Message').text(error.message || error).up()
.element('Message').text((error.message || error).toString()).up()
.up()
.up()
.element('RequestID').up();
Expand Down Expand Up @@ -113,7 +113,8 @@ handlers.DeleteDomain = function(context, request, response) {
deleted: true
}));
} catch (error) {
var body = createCommonErrorResponse('InternalFailure', error.message);
var body = createCommonErrorResponse('InternalFailure',
(error.message || error).toString());
response.contentType('application/xml');
response.send(body, 400);
}
Expand Down Expand Up @@ -164,7 +165,8 @@ handlers.DescribeDomains = function(context, request, response) {
hostname: getBaseDomain(request.headers.host)
}));
} catch (error) {
var body = createCommonErrorResponse('InternalFailure', error.message);
var body = createCommonErrorResponse('InternalFailure',
(error.message || error).toString());
response.contentType('application/xml');
response.send(body, 400);
}
Expand Down Expand Up @@ -240,22 +242,22 @@ handlers.DefineIndexField = function(context, request, response) {
request.query['TextOptions.FacetEnabled'] :
fieldType == 'literal' ?
request.query['LiteralOptions.FacetEnabled'] :
null ;
if (facetEnabled !== null)
undefined ;
if (facetEnabled !== undefined)
field.facetEnabled = facetEnabled.toLowerCase() == 'true';

var resultEnabled = fieldType == 'text' ?
request.query['TextOptions.ResultEnabled'] :
fieldType == 'literal' ?
request.query['LiteralOptions.ResultEnabled'] :
null ;
if (resultEnabled !== null)
undefined ;
if (resultEnabled !== undefined)
field.resultEnabled = resultEnabled.toLowerCase() == 'true';

var searchEnabled = fieldType == 'literal' ?
request.query['LiteralOptions.SearchEnabled'] :
null ;
if (searchEnabled !== null)
undefined ;
if (searchEnabled !== undefined)
field.searchEnabled = searchEnabled.toLowerCase() == 'true';

if (!field.exists()) {
Expand All @@ -271,7 +273,8 @@ handlers.DefineIndexField = function(context, request, response) {
updatedAt: createdAt
}));
} catch (error) {
var body = createCommonErrorResponse('InternalFailure', error.message);
var body = createCommonErrorResponse('InternalFailure',
(error.message || error).toString());
response.contentType('application/xml');
response.send(body, 400);
}
Expand All @@ -298,7 +301,8 @@ handlers.DeleteIndexField = function(context, request, response) {
response.contentType('application/xml');
response.send(createDeleteIndexFieldResponse({}));
} catch (error) {
var body = createCommonErrorResponse('InternalFailure', error.message);
var body = createCommonErrorResponse('InternalFailure',
(error.message || error).toString());
response.contentType('application/xml');
response.send(body, 400);
}
Expand Down Expand Up @@ -349,7 +353,8 @@ handlers.DescribeIndexFields = function(context, request, response) {
fields: fields
}));
} catch (error) {
var body = createCommonErrorResponse('InternalFailure', error.message);
var body = createCommonErrorResponse('InternalFailure',
(error.message || error).toString());
response.contentType('application/xml');
response.send(body, 400);
}
Expand Down Expand Up @@ -389,7 +394,8 @@ handlers.IndexDocuments = function(context, request, response) {
domain: domain
}));
} catch (error) {
var body = createCommonErrorResponse('InternalFailure', error.message);
var body = createCommonErrorResponse('InternalFailure',
(error.message || error).toString());
response.contentType('application/xml');
response.send(body, 400);
}
Expand Down Expand Up @@ -435,7 +441,8 @@ handlers.UpdateSynonymOptions = function(context, request, response) {
createdAt: updatedAt
}));
} catch (error) {
var body = createCommonErrorResponse('InternalFailure', error.message);
var body = createCommonErrorResponse('InternalFailure',
(error.message || error).toString());
response.contentType('application/xml');
response.send(body, 400);
}
Expand Down

0 comments on commit 1b2aa9d

Please sign in to comment.