Kouhei Sutou
null+****@clear*****
Mon Nov 10 15:39:44 JST 2014
Kouhei Sutou 2014-11-10 15:39:44 +0900 (Mon, 10 Nov 2014) New Revision: f5a5c1bf5d3e07c057a9494ef239c509337aa061 https://github.com/groonga/groonga-admin/commit/f5a5c1bf5d3e07c057a9494ef239c509337aa061 Message: Indent Modified files: app/scripts/controllers/table-search-controller.js Modified: app/scripts/controllers/table-search-controller.js (+270 -270) =================================================================== --- app/scripts/controllers/table-search-controller.js 2014-11-10 15:39:15 +0900 (9c167db) +++ app/scripts/controllers/table-search-controller.js 2014-11-10 15:39:44 +0900 (1c9167c) @@ -11,307 +11,307 @@ angular.module('groongaAdminApp') .controller('TableSearchController', [ '$scope', '$routeParams', '$location', '$http', '$filter', function ($scope, $routeParams, $location, $http, $filter) { - var client = new GroongaClient($http); - - function computeCurrentPage(offset) { - return Math.ceil((parseInt(offset) + 1) / $scope.nRecordsInPage); - } - - function initialize() { - $scope.table = $routeParams.table; - $scope.style = 'table'; - $scope.response = { - rawData: [], - columns: [], - records: [], - drilldowns: [], - elapsedTimeInMilliseconds: 0, - nTotalRecords: 0 - }; - $scope.indexedColumns = []; - $scope.allTables = []; - $scope.allColumns = []; - $scope.commandLine = ''; - $scope.message = ''; - $scope.currentPage = 1; - $scope.nRecordsInPage = 10; - $scope.maxNPages = 10; - $scope.parameters = angular.copy($location.search()); - - $scope.search = search; - $scope.clear = clear; - $scope.toggleSort = toggleSort; - $scope.selectDrilldown = selectDrilldown; - } - - function packColumns(columns) { - var names = columns.map(function(column) { - return column.name; - }); - return names.join(','); - } - - function packSortColumns(columns) { - var keys = columns.map(function(column) { - if (column.sort === 'ascending') { - return column.name; - } else { - return '-' + column.name; - } - }); - return keys.join(','); - } - - function search() { - var parameters = angular.copy($scope.parameters); - - var matchColumns = $scope.indexedColumns.filter(function(column) { - return column.inUse; - }); - parameters.match_columns = packColumns(matchColumns); - - var outputColumns = $scope.allColumns.filter(function(column) { - return column.output; - }); - parameters.output_columns = packColumns(outputColumns); - - parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage; - parameters.limit = $scope.nRecordsInPage; - - var sortColumns = $scope.response.columns.filter(function(column) { - return column.sort; - }); - parameters.sortby = packSortColumns(sortColumns); - - var drilldowns = $scope.allColumns.filter(function(column) { - return column.drilldown; - }); - parameters.drilldown = packColumns(drilldowns); - - parameters.drilldown_sortby = '-_nsubrecs'; - - $location.search(parameters); - } - - function clear() { - $location.search({}); - } - - function setColumnSort(column, sort) { - column.sort = sort; - switch (column.sort) { - case 'ascending': - column.iconClass = 'glyphicon-sort-by-attributes'; - break; - case 'descending': - column.iconClass = 'glyphicon-sort-by-attributes-alt'; - break; - default: - column.iconClass = 'glyphicon-sort'; - break; + var client = new GroongaClient($http); + + function computeCurrentPage(offset) { + return Math.ceil((parseInt(offset) + 1) / $scope.nRecordsInPage); } - } - - function toggleSort(column) { - var sort; - switch (column.sort) { - case 'ascending': - sort = 'descending'; - break; - case 'descending': - sort = null; - break; - default: - sort = 'ascending'; - break; + + function initialize() { + $scope.table = $routeParams.table; + $scope.style = 'table'; + $scope.response = { + rawData: [], + columns: [], + records: [], + drilldowns: [], + elapsedTimeInMilliseconds: 0, + nTotalRecords: 0 + }; + $scope.indexedColumns = []; + $scope.allTables = []; + $scope.allColumns = []; + $scope.commandLine = ''; + $scope.message = ''; + $scope.currentPage = 1; + $scope.nRecordsInPage = 10; + $scope.maxNPages = 10; + $scope.parameters = angular.copy($location.search()); + + $scope.search = search; + $scope.clear = clear; + $scope.toggleSort = toggleSort; + $scope.selectDrilldown = selectDrilldown; } - setColumnSort(column, sort); - search(); - } - - function selectDrilldown(key, value) { - var queryKey = key; - var column = $scope.allColumns.find(function(column) { - return column.name === key; - }); - if (column) { - var isTableType = $scope.allTables.some(function(table) { - return table.name === column.type; + + function packColumns(columns) { + var names = columns.map(function(column) { + return column.name; }); - if (isTableType) { - queryKey += '._key'; - } + return names.join(','); } - var escapedValue = '"' + value.replace('"', '\\"') + '"'; - - var query = $scope.parameters.query || ''; - if (query.length > 0) { - query += ' '; + function packSortColumns(columns) { + var keys = columns.map(function(column) { + if (column.sort === 'ascending') { + return column.name; + } else { + return '-' + column.name; + } + }); + return keys.join(','); } - $scope.parameters.query = query + queryKey + ':' + escapedValue; - var drilldowns = ($scope.parameters.drilldown || '').split(/\s*,\s*/); - drilldowns = drilldowns.filter(function(drilldown) { - return drilldown !== key; - }); - $scope.parameters.drilldown = drilldowns.join(','); + function search() { + var parameters = angular.copy($scope.parameters); + + var matchColumns = $scope.indexedColumns.filter(function(column) { + return column.inUse; + }); + parameters.match_columns = packColumns(matchColumns); + + var outputColumns = $scope.allColumns.filter(function(column) { + return column.output; + }); + parameters.output_columns = packColumns(outputColumns); + + parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage; + parameters.limit = $scope.nRecordsInPage; + + var sortColumns = $scope.response.columns.filter(function(column) { + return column.sort; + }); + parameters.sortby = packSortColumns(sortColumns); - search(); - } + var drilldowns = $scope.allColumns.filter(function(column) { + return column.drilldown; + }); + parameters.drilldown = packColumns(drilldowns); - function createColumnInfo(column) { - var name = column.name; + parameters.drilldown_sortby = '-_nsubrecs'; - var output = true; - var outputColumns = $scope.parameters.output_columns; - if (outputColumns) { - outputColumns = outputColumns.split(/\s*,\s*/); - output = outputColumns.indexOf(name) !== -1; + $location.search(parameters); } - var drilldown = false; - var drilldowns = $scope.parameters.drilldown; - if (drilldowns) { - drilldowns = drilldowns.split(/\s*,\s*/); - drilldown = drilldowns.indexOf(name) !== -1; + function clear() { + $location.search({}); } - return { - name: name, - type: column.range, - output: output, - drilldown: drilldown - }; - } + function setColumnSort(column, sort) { + column.sort = sort; + switch (column.sort) { + case 'ascending': + column.iconClass = 'glyphicon-sort-by-attributes'; + break; + case 'descending': + column.iconClass = 'glyphicon-sort-by-attributes-alt'; + break; + default: + column.iconClass = 'glyphicon-sort'; + break; + } + } - function extractColumnsInfo(table, columns) { - if (table.name === $scope.table) { - columns.forEach(function(column) { - if (column.isIndex) { - return; + function toggleSort(column) { + var sort; + switch (column.sort) { + case 'ascending': + sort = 'descending'; + break; + case 'descending': + sort = null; + break; + default: + sort = 'ascending'; + break; + } + setColumnSort(column, sort); + search(); + } + + function selectDrilldown(key, value) { + var queryKey = key; + var column = $scope.allColumns.find(function(column) { + return column.name === key; + }); + if (column) { + var isTableType = $scope.allTables.some(function(table) { + return table.name === column.type; + }); + if (isTableType) { + queryKey += '._key'; } - $scope.allColumns.push(createColumnInfo(column)); + } + + var escapedValue = '"' + value.replace('"', '\\"') + '"'; + + var query = $scope.parameters.query || ''; + if (query.length > 0) { + query += ' '; + } + $scope.parameters.query = query + queryKey + ':' + escapedValue; + + var drilldowns = ($scope.parameters.drilldown || '').split(/\s*,\s*/); + drilldowns = drilldowns.filter(function(drilldown) { + return drilldown !== key; }); + $scope.parameters.drilldown = drilldowns.join(','); + + search(); } - columns.forEach(function(column) { - if (!column.isIndex) { - return; + function createColumnInfo(column) { + var name = column.name; + + var output = true; + var outputColumns = $scope.parameters.output_columns; + if (outputColumns) { + outputColumns = outputColumns.split(/\s*,\s*/); + output = outputColumns.indexOf(name) !== -1; } - if (column.range !== $scope.table) { - return; + + var drilldown = false; + var drilldowns = $scope.parameters.drilldown; + if (drilldowns) { + drilldowns = drilldowns.split(/\s*,\s*/); + drilldown = drilldowns.indexOf(name) !== -1; } - var matchColumns = $scope.parameters.match_columns; - column.sources.forEach(function(source) { - var localName; - if (source.indexOf('.') === -1) { - localName = '_key'; - } else { - localName = source.split('.')[1]; + + return { + name: name, + type: column.range, + output: output, + drilldown: drilldown + }; + } + + function extractColumnsInfo(table, columns) { + if (table.name === $scope.table) { + columns.forEach(function(column) { + if (column.isIndex) { + return; + } + $scope.allColumns.push(createColumnInfo(column)); + }); + } + + columns.forEach(function(column) { + if (!column.isIndex) { + return; } - var inUse = true; - if (matchColumns) { - inUse = matchColumns.indexOf(localName) !== -1; + if (column.range !== $scope.table) { + return; } - $scope.indexedColumns.push({ - name: localName, - inUse: inUse + var matchColumns = $scope.parameters.match_columns; + column.sources.forEach(function(source) { + var localName; + if (source.indexOf('.') === -1) { + localName = '_key'; + } else { + localName = source.split('.')[1]; + } + var inUse = true; + if (matchColumns) { + inUse = matchColumns.indexOf(localName) !== -1; + } + $scope.indexedColumns.push({ + name: localName, + inUse: inUse + }); }); }); - }); - } - - function extractTableInfo(table) { - if (table.name === $scope.table) { - var idColumn = { - name: '_id', - range: "UInt32" - }; - $scope.allColumns.push(createColumnInfo(idColumn)); } - client.execute('column_list', {table: table.name}) - .success(function(response) { - extractColumnsInfo(table, response.columns()); - }); - } - - function fillOptions() { - client.execute('table_list') - .success(function(response) { - $scope.allTables = response.tables(); - $scope.allTables.forEach(function(table) { - extractTableInfo(table); - }); - }); - } - - function select() { - var parameters = { - table: $scope.table - }; - angular.forEach($scope.parameters, function(value, key) { - if (key in parameters) { - return; - } - parameters[key] = value; - }); - var request = client.execute('select', parameters); - request.success(function(response) { - $scope.response.rawData = response.rawData(); - $scope.commandLine = request.commandLine(); - $scope.response.elapsedTimeInMilliseconds = - response.elapsedTime() * 1000; - if (!response.isSuccess()) { - $scope.message = - 'Failed to call "select" command: ' + response.errorMessage(); - $scope.response.nTotalRecords = 0; - return; + function extractTableInfo(table) { + if (table.name === $scope.table) { + var idColumn = { + name: '_id', + range: "UInt32" + }; + $scope.allColumns.push(createColumnInfo(idColumn)); } - $scope.currentPage = computeCurrentPage(parameters.offset || 0); - $scope.response.nTotalRecords = response.nTotalRecords(); - var sortKeys = ($scope.parameters.sortby || '').split(/\s*,\s*/); - $scope.response.columns = response.columns().map(function(column) { - var sort = null; - if (sortKeys.indexOf(column.name) !== -1) { - sort = 'ascending'; - } else if (sortKeys.indexOf('-' + column.name) !== -1) { - sort = 'descending'; + + client.execute('column_list', {table: table.name}) + .success(function(response) { + extractColumnsInfo(table, response.columns()); + }); + } + + function fillOptions() { + client.execute('table_list') + .success(function(response) { + $scope.allTables = response.tables(); + $scope.allTables.forEach(function(table) { + extractTableInfo(table); + }); + }); + } + + function select() { + var parameters = { + table: $scope.table + }; + angular.forEach($scope.parameters, function(value, key) { + if (key in parameters) { + return; } - setColumnSort(column, sort); - return column; + parameters[key] = value; }); - $scope.response.records = response.records().map(function(record) { - return record.map(function(value, index) { - var column = $scope.response.columns[index]; - var formattedValue; - if (column.type === 'Time') { - var iso8601Format = 'yyyy-MM-ddTHH:mm:ss.sssZ'; - formattedValue = $filter('date')(value * 1000, iso8601Format); - } else { - formattedValue = value; + var request = client.execute('select', parameters); + request.success(function(response) { + $scope.response.rawData = response.rawData(); + $scope.commandLine = request.commandLine(); + $scope.response.elapsedTimeInMilliseconds = + response.elapsedTime() * 1000; + if (!response.isSuccess()) { + $scope.message = + 'Failed to call "select" command: ' + response.errorMessage(); + $scope.response.nTotalRecords = 0; + return; + } + $scope.currentPage = computeCurrentPage(parameters.offset || 0); + $scope.response.nTotalRecords = response.nTotalRecords(); + var sortKeys = ($scope.parameters.sortby || '').split(/\s*,\s*/); + $scope.response.columns = response.columns().map(function(column) { + var sort = null; + if (sortKeys.indexOf(column.name) !== -1) { + sort = 'ascending'; + } else if (sortKeys.indexOf('-' + column.name) !== -1) { + sort = 'descending'; } - return { - value: value, - formattedValue: formattedValue, - column: column - }; + setColumnSort(column, sort); + return column; }); - }); - $scope.response.drilldowns = response.drilldowns(); - ($scope.parameters.drilldown || '') - .split(/\s*,\s*/) - .filter(function(drilldown) { - return drilldown.length > 0; - }) - .forEach(function(drilldown, i) { - $scope.response.drilldowns[i].key = drilldown; + $scope.response.records = response.records().map(function(record) { + return record.map(function(value, index) { + var column = $scope.response.columns[index]; + var formattedValue; + if (column.type === 'Time') { + var iso8601Format = 'yyyy-MM-ddTHH:mm:ss.sssZ'; + formattedValue = $filter('date')(value * 1000, iso8601Format); + } else { + formattedValue = value; + } + return { + value: value, + formattedValue: formattedValue, + column: column + }; + }); }); - }); - } + $scope.response.drilldowns = response.drilldowns(); + ($scope.parameters.drilldown || '') + .split(/\s*,\s*/) + .filter(function(drilldown) { + return drilldown.length > 0; + }) + .forEach(function(drilldown, i) { + $scope.response.drilldowns[i].key = drilldown; + }); + }); + } - initialize(); - fillOptions(); - select(); - }]); + initialize(); + fillOptions(); + select(); + }]); -------------- next part -------------- HTML����������������������������...下載
