[Groonga-commit] groonga/groonga-admin at aea53c7 [master] Show command line

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Oct 23 11:11:31 JST 2014


Kouhei Sutou	2014-10-23 11:11:31 +0900 (Thu, 23 Oct 2014)

  New Revision: aea53c7f617b3cd1b551ab2467b3e7a6cdddf08b
  https://github.com/groonga/groonga-admin/commit/aea53c7f617b3cd1b551ab2467b3e7a6cdddf08b

  Message:
    Show command line

  Modified files:
    app/scripts/controllers/table-search-controller.js
    app/views/tables/search.html

  Modified: app/scripts/controllers/table-search-controller.js (+23 -0)
===================================================================
--- app/scripts/controllers/table-search-controller.js    2014-10-23 10:49:05 +0900 (fe7811a)
+++ app/scripts/controllers/table-search-controller.js    2014-10-23 11:11:31 +0900 (f688d04)
@@ -9,9 +9,30 @@
  */
 angular.module('groongaAdminApp')
   .controller('TableSearchController', function ($scope, $routeParams, $http) {
+    function escapeCommandValue(value) {
+      return value.replace(/(["\\])/g, function(match) {
+        return '\\' + match[1];
+      });
+    }
+
+    function buildCommandLine(name, parameters) {
+      var components = [name];
+      for (var key in parameters) {
+        if (key === 'callback') {
+          continue;
+        }
+        components.push('--' + key);
+
+        var value = parameters[key];
+        components.push('"' + escapeCommandValue(value) + '"');
+      }
+      return components.join(' ');
+    }
+
     $scope.table = $routeParams.table;
     $scope.columns = [];
     $scope.records = [];
+    $scope.commandLine = '';
     $scope.message = '';
     $scope.elapsedTimeInMilliseconds = 0;
     $scope.nTotalRecords = 0;
@@ -22,6 +43,8 @@ angular.module('groongaAdminApp')
     };
     $http.jsonp('/d/select.json', {params: parameters})
       .success(function(data) {
+        $scope.commandLine = buildCommandLine('select', parameters);
+
         var response = new window.GroongaResponse.Select(data);
         $scope.elapsedTimeInMilliseconds = response.elapsedTime() * 1000;
         if (!response.isSuccess()) {

  Modified: app/views/tables/search.html (+3 -0)
===================================================================
--- app/views/tables/search.html    2014-10-23 10:49:05 +0900 (ceaf31e)
+++ app/views/tables/search.html    2014-10-23 11:11:31 +0900 (f67690e)
@@ -3,6 +3,9 @@
   <div class="alert alert-warning" ng-show="message.length &gt; 0">
     <p>{{message}}</p>
   </div>
+  <p class="command-line">
+    <code id="groonga-command-line">{{commandLine}}</code>
+  </p>
   <p class="statistics">
     <span id="n-total-records">{{nTotalRecords}} records</span>
     <span id="elapsed-time">({{elapsedTimeInMilliseconds | number : 3}}ms)</span>
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index