YUKI Hiroshi
null+****@clear*****
Wed Sep 21 17:16:10 JST 2016
YUKI Hiroshi 2016-09-21 17:16:10 +0900 (Wed, 21 Sep 2016) New Revision: 0fe2c02ce1e2c816e7835bd7f378656ac924346b https://github.com/groonga/groonga-admin/commit/0fe2c02ce1e2c816e7835bd7f378656ac924346b Merged eebf840: Merge pull request #10 from groonga/features/migrate-table_list-to-schema Message: Use camelCase and meaningful name by default Modified files: app/scripts/services/schema-loader.js Modified: app/scripts/services/schema-loader.js (+7 -5) =================================================================== --- app/scripts/services/schema-loader.js 2016-09-21 17:09:35 +0900 (3a574d9) +++ app/scripts/services/schema-loader.js 2016-09-21 17:16:10 +0900 (ddb7d0f) @@ -100,23 +100,22 @@ angular.module('groongaAdminApp') table.id = 0; // XXX it exists in a table_list response but missing in a schema response. table.name = rawTable.name; table.path = ''; // XXX it exists in a table_list response but missing in a schema response. - table.flags = []; - table.domain = rawTable.key_type && rawTable.key_type.name; - table.range = rawTable.value_type && rawTable.value_type.name + table.valueType = rawTable.value_type && rawTable.value_type.name table.tokenizer = rawTable.tokenizer && rawTable.tokenizer.name; table.normalizer = rawTable.normalizer && rawTable.normalizer.name; - table.tokenFilters = ''; table.type = rawTable.type; - table.keyType = null; + table.flags = []; if (rawTable.command && rawTable.command.arguments && rawTable.command.arguments.flags) table.flags = rawTable.command.arguments.flags.split('|'); + table.tokenFilters = ''; if (rawTable.token_filters) table.tokenFilters = rawTable.token_filters.join('|'); // XXX what is the correct delimiter? + table.keyType = null; if (rawTable.key_type) { table.keyType = { name: rawTable.key_type.name, @@ -130,6 +129,9 @@ angular.module('groongaAdminApp') table.isDoubleArrayTrie = table.type == 'double attay trie'; table.hasKey = !table.isArray; + table.range = table.valueType; // for backward compatibility + table.domain = table.keyType && table.keyType.name; // for backward compatibility + return table; } -------------- next part -------------- HTML����������������������������...Descargar
