YUKI Hiroshi
null+****@clear*****
Mon Dec 10 16:27:20 JST 2012
YUKI Hiroshi 2012-12-10 16:27:20 +0900 (Mon, 10 Dec 2012) New Revision: 789211bb492ee7590ee6be1dce3bc3b284cccaa4 https://github.com/groonga/gcs/commit/789211bb492ee7590ee6be1dce3bc3b284cccaa4 Log: Don't output status of index fields Modified files: bin/gcs-configure-from-sdf lib/client.js Modified: bin/gcs-configure-from-sdf (+4 -4) =================================================================== --- bin/gcs-configure-from-sdf 2012-12-10 16:24:32 +0900 (a6eedb3) +++ bin/gcs-configure-from-sdf 2012-12-10 16:27:20 +0900 (42f7a6d) @@ -38,7 +38,7 @@ function listExistingFields(callback) { client.raiseFatalError(error); indexFields.forEach(function(indexField) { - console.log(client.summarizeIndexFieldStatus(indexField)); + console.log(client.summarizeIndexFieldStatus(indexField, true)); }); callback(null, indexFields); @@ -109,7 +109,7 @@ function collectFieldConfigurations(sourceFile, existingFieldNames) { function listDetectedFields(fields) { console.log('Detected field configurations from all the sources :'); fields.forEach(function(field) { - console.log(client.summarizeIndexFieldStatus(field)); + console.log(client.summarizeIndexFieldStatus(field, true)); }); } @@ -119,12 +119,12 @@ function listProposedFields(fields, existingFields) { var listedFieldNames = {}; fields.forEach(function(field) { var status = field.existing ? '[UPDATE]' : '[NEW]'; - allFields.push(client.summarizeIndexFieldStatus(field) + ' ' + status); + allFields.push(client.summarizeIndexFieldStatus(field, true) + ' ' + status); listedFieldNames[field.Options.IndexFieldName] = true; }); existingFields.forEach(function(field) { if (!(field.Options.IndexFieldName in listedFieldNames)) - allFields.push(client.summarizeIndexFieldStatus(field) + ' [NO CHANGE]'); + allFields.push(client.summarizeIndexFieldStatus(field, true) + ' [NO CHANGE]'); }); allFields.sort().forEach(function(summary) { console.log(summary); Modified: lib/client.js (+2 -2) =================================================================== --- lib/client.js 2012-12-10 16:24:32 +0900 (5f08aa8) +++ lib/client.js 2012-12-10 16:27:20 +0900 (8aa2fff) @@ -292,7 +292,7 @@ Client.prototype = { ); }, - summarizeIndexFieldStatus: function(status) { + summarizeIndexFieldStatus: function(status, noStatus) { var type = status.Options.IndexFieldType; var options = status.Options.TextOptions || status.Options.UIntOptions || @@ -307,7 +307,7 @@ Client.prototype = { summarizedOptions.push('Result'); return status.Options.IndexFieldName + ' ' + - status.Status.State + ' ' + + (noStatus ? '' : (status.Status.State + ' ')) + type + ' (' + summarizedOptions.join(' ') + ')'; }, -------------- next part -------------- HTML����������������������������...Download