Navigation Menu

Skip to content

Commit

Permalink
Return current synonyms from the database, as a response of UpdateSyn…
Browse files Browse the repository at this point in the history
…onymOptions
  • Loading branch information
piroor committed Aug 15, 2012
1 parent 6954543 commit 857e1d4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
19 changes: 7 additions & 12 deletions lib/api/2011-02-01/configuration.js
Expand Up @@ -412,10 +412,13 @@ handlers.IndexDocuments = function(context, request, response) {
};

function createSynonymOptionsStatus(options) {
var synonyms = options.domain.getSynonymsSync();
var synonymOptions = { synonyms: synonyms };

var synonymOptionsStatus = xmlbuilder.create();
synonymOptionsStatus.begin('Synonyms', { version: '1.0' })
.element('Options')
.text(options.synonymOptions || '{}')
.text(JSON.stringify(synonymOptions))
.up()
.importXMLBuilder(createOptionStatus({ createdAt: options.createdAt,
state: options.state,
Expand Down Expand Up @@ -443,13 +446,11 @@ handlers.UpdateSynonymOptions = function(context, request, response) {
try {
var synonymOptionsJson = request.query.Synonyms;
var synonymOptions = JSON.parse(synonymOptionsJson);

var updatedAt = new Date();

domain.updateSynonymsSync(synonymOptions.synonyms);

var updatedAt = new Date();
response.send(createUpdateSynonymOptionsResponse({
synonymOptions: JSON.stringify(synonymOptions),
domain: domain,
updatedAt: updatedAt,
createdAt: updatedAt
}));
Expand Down Expand Up @@ -477,15 +478,9 @@ function createDescribeSynonymOptionsResponse(options) {
handlers.DescribeSynonymOptions = function(context, request, response) {
var domain = new Domain(request.query.DomainName, context);
try {
var synonyms = domain.getSynonymsSync();
var synonymOptions = { synonyms: synonyms };

var updatedAt = new Date();

domain.updateSynonymsSync(synonymOptions.synonyms);

response.send(createDescribeSynonymOptionsResponse({
synonymOptions: JSON.stringify(synonymOptions),
domain: domain,
updatedAt: updatedAt,
createdAt: updatedAt
}));
Expand Down
8 changes: 4 additions & 4 deletions test/api-configuration.test.js
Expand Up @@ -931,8 +931,8 @@ suite('Configuration API', function() {
synonymOptions = JSON.parse(synonymOptions);
var expectedSynonymOptions = {
synonyms: {
tokio: ['tokyo'],
dekkaido: 'hokkaido'
dekkaido: ['hokkaido'],
tokio: ['tokyo']
}
};
assert.deepEqual(expectedSynonymOptions, synonymOptions);
Expand Down Expand Up @@ -991,8 +991,8 @@ suite('Configuration API', function() {
synonymOptions = JSON.parse(synonymOptions);
var expectedSynonymOptions = {
synonyms: {
tokio: ['tokyo'],
dekkaido: 'hokkaido'
dekkaido: ['hokkaido'],
tokio: ['tokyo']
}
};
assert.deepEqual(expectedSynonymOptions, synonymOptions);
Expand Down

0 comments on commit 857e1d4

Please sign in to comment.