YUKI Hiroshi
null+****@clear*****
Mon Dec 10 16:23:55 JST 2012
YUKI Hiroshi 2012-12-10 16:23:55 +0900 (Mon, 10 Dec 2012) New Revision: d91dc0926f99c698225785c233693eb2f6940281 https://github.com/groonga/gcs/commit/d91dc0926f99c698225785c233693eb2f6940281 Log: Fix message of gcs-configure-from-sdf Modified files: bin/gcs-configure-from-sdf Modified: bin/gcs-configure-from-sdf (+18 -7) =================================================================== --- bin/gcs-configure-from-sdf 2012-12-10 16:17:51 +0900 (f642d29) +++ bin/gcs-configure-from-sdf 2012-12-10 16:23:55 +0900 (ab121c6) @@ -37,13 +37,11 @@ function listExistingFields(callback) { if (error) client.raiseFatalError(error); - var existingFieldNames = []; indexFields.forEach(function(indexField) { - existingFieldNames.push(indexField.Options.IndexFieldName); console.log(client.summarizeIndexFieldStatus(indexField)); }); - callback(null, existingFieldNames); + callback(null, indexFields); }); } @@ -115,11 +113,21 @@ function listDetectedFields(fields) { }); } -function listProposedFields(fields) { +function listProposedFields(fields, existingFields) { console.log('New proposed field configuration for the domain - %s :', client.domainName); + var allFields = []; + var listedFieldNames = {}; fields.forEach(function(field) { var status = field.existing ? '[UPDATE]' : '[NEW]'; - console.log(client.summarizeIndexFieldStatus(field) + ' ' + status); + allFields.push(client.summarizeIndexFieldStatus(field) + ' ' + status); + listedFieldNames[field.Options.IndexFieldName] = true; + }); + existingFields.forEach(function(field) { + if (!(field.Options.IndexFieldName in listedFieldNames)) + allFields.push(client.summarizeIndexFieldStatus(field) + ' [NO CHANGE]'); + }); + allFields.sort().forEach(function(summary) { + console.log(summary); }); } @@ -178,7 +186,10 @@ client.getDomainStatus(function(error, domain) { var separator = '-----------------------------------------------------------------------------------'; console.log(separator); - listExistingFields(function(error, existingFieldNames) { + listExistingFields(function(error, indexFields) { + var existingFieldNames = indexFields.map(function(indexField) { + return indexField.Options.IndexFieldName; + }); try { console.log(separator); var fields = collectFieldConfigurations(sourceFile, existingFieldNames); @@ -207,7 +218,7 @@ client.getDomainStatus(function(error, domain) { process.exit(1); } - listProposedFields(fields); + listProposedFields(fields, indexField); console.log(separator); -------------- next part -------------- HTML����������������������������... Télécharger