groonga/groonga-admin at 4f88c9e [master] Support --match_columns and --query (Groonga-commit) - Groonga - fulltext search engine.

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

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

  Message:
    Support --match_columns and --query

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

  Modified: app/scripts/controllers/table-search-controller.js (+16 -1)
===================================================================

--- app/scripts/controllers/table-search-controller.js    2014-10-23 11:37:30 +0900 (a619105)
+++ app/scripts/controllers/table-search-controller.js    2014-10-23 11:47:44 +0900 (1124317)
@@ -8,7 +8,7 @@
  * Controller of the groongaAdminApp
  */
 angular.module('groongaAdminApp')
-  .controller('TableSearchController', function ($scope, $routeParams, $http) {
+  .controller('TableSearchController', function ($scope, $routeParams, $location, $http) {
     function escapeCommandValue(value) {
       return value.replace(/(["\\])/g, function(match) {
         return '\\' + match[1];
@@ -35,11 +35,26 @@ angular.module('groongaAdminApp')
     $scope.message = '';
     $scope.elapsedTimeInMilliseconds = 0;
     $scope.nTotalRecords = 0;
+    $scope.parameters = angular.copy($location.search());
+
+    $scope.search = function(parameters) {
+      $location.search(parameters);
+    };
+
+    $scope.clear = function() {
+      $location.search({});
+    };
 
     var parameters = {
       table: $scope.table,
       callback: 'JSON_CALLBACK'
     };
+    angular.forEach($scope.parameters, function(value, key) {
+      if (key in parameters) {
+        return;
+      }
+      parameters[key] = value;
+    });
     $http.jsonp('/d/select.json', {params: parameters})
       .success(function(data) {
         $scope.commandLine = buildCommandLine('select', parameters);

  Modified: app/views/tables/search.html (+14 -0)
===================================================================
--- app/views/tables/search.html    2014-10-23 11:37:30 +0900 (f67690e)
+++ app/views/tables/search.html    2014-10-23 11:47:44 +0900 (59ea566)
@@ -3,6 +3,20 @@
   <div class="alert alert-warning" ng-show="message.length &gt; 0">
     <p>{{message}}</p>
   </div>
+  <form role="search">
+    <div class="form-group">
+      <div class="input-group">
+        <span class="input-group-addon">match_columns</span>
+        <input type="search" class="form-control" ng-model="parameters.match_columns">
+      </div>
+      <div class="input-group">
+        <span class="input-group-addon">query</span>
+        <input type="search" class="form-control" ng-model="parameters.query">
+      </div>
+    </div>
+    <button ng-click="search(parameters)" class="btn btn-default">Search</button>
+    <button ng-click="clear()" class="btn btn-default">Clear</button>
+  </form>
   <p class="command-line">
     <code id="groonga-command-line">{{commandLine}}</code>
   </p>
-------------- next part --------------
HTML����������������������������...
下載 


Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga-admin at 4f88c9e [master] Support --match_columns and --query