Navigation Menu

Skip to content

Commit

Permalink
Update behaviour around index field options
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 13, 2012
1 parent 9ccf827 commit e752b78
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
10 changes: 6 additions & 4 deletions lib/api/2011-02-01/configuration.js
Expand Up @@ -247,6 +247,9 @@ handlers.DefineIndexField = function(context, request, response) {

var createdAt = new Date();
try {
if (!field.exists())
field.type = fieldType;

var facetEnabled = getFieldOption('FacetEnabled', request, fieldType);
if (facetEnabled !== undefined)
field.facetEnabled = facetEnabled.toLowerCase() == 'true';
Expand All @@ -259,12 +262,11 @@ handlers.DefineIndexField = function(context, request, response) {
if (searchEnabled !== undefined)
field.searchEnabled = searchEnabled.toLowerCase() == 'true';

if (!field.exists()) {
field.type = fieldType;
if (!field.exists())
field.createSync();
} else {
else
field.saveOptionsSync();
}

response.contentType('application/xml');
response.send(createDefineIndexFieldResponse({
field: field,
Expand Down
10 changes: 5 additions & 5 deletions test/api-configuration.test.js
Expand Up @@ -433,7 +433,7 @@ suite('Configuration API', function() {
.next(function(response) {
var domain = new Domain('companies', context);
var field = domain.getIndexField('name');
assert.isTrue(field.exists());
assert.isTrue(field.exists(), response.body);

response = toParsedResponse(response);
assert.deepEqual(response.pattern,
Expand Down Expand Up @@ -470,7 +470,7 @@ suite('Configuration API', function() {
.next(function(response) {
var domain = new Domain('companies', context);
var field = domain.getIndexField('name');
assert.isTrue(field.exists());
assert.isTrue(field.exists(), response.body);

response = toParsedResponse(response);
assert.deepEqual(response.pattern,
Expand Down Expand Up @@ -506,7 +506,7 @@ suite('Configuration API', function() {
.next(function(response) {
var domain = new Domain('companies', context);
var field = domain.getIndexField('age');
assert.isTrue(field.exists());
assert.isTrue(field.exists(), response.body);

response = toParsedResponse(response);
assert.deepEqual(response.pattern,
Expand Down Expand Up @@ -540,7 +540,7 @@ suite('Configuration API', function() {
.next(function(response) {
var domain = new Domain('companies', context);
var field = domain.getIndexField('product');
assert.isTrue(field.exists());
assert.isTrue(field.exists(), response.body);

response = toParsedResponse(response);
assert.deepEqual(response.pattern,
Expand Down Expand Up @@ -580,7 +580,7 @@ suite('Configuration API', function() {
.next(function(response) {
var domain = new Domain('companies', context);
var field = domain.getIndexField('product');
assert.isTrue(field.exists());
assert.isTrue(field.exists(), response.body);

response = toParsedResponse(response);
assert.deepEqual(response.pattern,
Expand Down

0 comments on commit e752b78

Please sign in to comment.