use fewer routes and search in all columns

src/main/resource/static/search.html

@@ -19,12 +19,7 @@
 
     <form ng-submit="search()">
         <p>restrict the number of displayed entries to support fast searches in
-            every column</p>
-        <input type="text" ng-model="searchText" size="30"
-               placeholder="search"/>
-        in:
-        <select ng-model="field" ng-init="columns[shortMsg].long"
-                ng-options="columns[key].long for key in colProps | filter : '!id'"></select>
+            every column. Click "search" to reload choice (revealing undisplayed entries).</p>
         <input class="btn-primary" type="submit" value="search"/>
         <span>
             maximal entries:
@@ -36,7 +31,7 @@
     <br>
     <table>
         <thead>
-        <tr ng-if="results.length != 0">
+        <tr>
             <th ng-repeat="key in colProps" ng-if="columns[key].x">
                 <span ng-click="sort.col = key; sort.asc = !sort.asc"
                       style="cursor:pointer">

src/main/resource/static/search.js

@@ -18,18 +18,21 @@ angular.module('searchApp', []).controller('SearchController',
     $scope.number = 0;
     $scope.maxNumber = 100;
     $scope.searchText = '';
-    $scope.query = function () { return '/' + $scope.field +
-        '?limit=' + $scope.maxNumber +
-        '&text=' + $scope.searchText;
+    $scope.query = function () {
+         var res = '';
+         for (k in $scope.columns) {
+                res = res + '&' + k + "=" + $scope.columns[k].search;
+            };
+         return '?limit=' + $scope.maxNumber + res;
         };
     $scope.search = function() {
-        $http.get('/sally/error/search' + $scope.query()).success(function(data) {
+        $http.get('/sally/error/search2' + $scope.query()).success(function(data) {
           $scope.results = data;
         });
       $scope.count();
     };
     $scope.count = function() {
-        $http.get('/sally/error/count' + $scope.query()).success(function(data) {
+        $http.get('/sally/error/count2' + $scope.query()).success(function(data) {
           $scope.number = data[0].count;
         });
     };

src/main/scala/SearchDB.scala

@@ -9,12 +9,23 @@ import org.apache.camel.scala.dsl.builder.RouteBuilder
 import org.apache.camel.util.jndi.JndiContext
 import org.eclipse.jetty.server.handler.ResourceHandler
 
+import scala.collection.JavaConverters._
+
 class SearchDB(inPrefix: String, addStaticRoute: Boolean) extends RouteBuilder {
 
-  def query2HashMap(ex: Exchange): util.HashMap[String, String] = {
+  def query2HashMap2(ex: Exchange): util.HashMap[String, String] = {
     val hm = new util.HashMap[String, String]()
-    hm.put("text", "%" + ex.getIn.getHeader("text") + "%")
-    hm.put("limit", ex.getIn.getHeader("limit").toString)
+    val inMap = ex.getIn.getHeaders.asScala
+    Table.columns map { col =>
+      hm.put(col, inMap.get(col) match {
+        case Some(v: String) if v.nonEmpty => "%" + v + "%"
+        case _ => "%"
+      })
+    }
+    hm.put("limit", inMap.get("limit") match {
+      case Some(v) => v.toString
+      case _ => "100000"
+    })
     hm
   }
 
@@ -25,15 +36,14 @@ class SearchDB(inPrefix: String, addStaticRoute: Boolean) extends RouteBuilder {
       ("log:lll" + this.getClass + "?showHeaders=true")
     prefix = inPrefix + "sally/error/"
   }
-  Table.columns.map { col =>
-    ((prefix + "count/" + col) transform
-      (ex => "%" + ex.getIn.getHeader("text") + "%")) -->
-      ("db:SELECT COUNT(*) as count FROM errors WHERE " + col + " LIKE #") marshal
+  ((prefix + "search2") transform query2HashMap2) -->
+    ("db:SELECT * FROM errors WHERE " +
+      Table.columns.map(col => col + " LIKE :#" + col).mkString(" AND ") +
+      " LIMIT :#limit") marshal new DataFormatDefinition(new JacksonDataFormat())
+  ((prefix + "count2") transform query2HashMap2) -->
+    ("db:SELECT COUNT(*) as count FROM errors WHERE " +
+      Table.columns.map(col => col + " LIKE :#" + col).mkString(" AND ")) marshal
     new DataFormatDefinition(new JacksonDataFormat())
-    ((prefix + "search/" + col) transform query2HashMap) -->
-      ("db:SELECT * FROM errors WHERE " + col + " LIKE :#text LIMIT :#limit") marshal
-      new DataFormatDefinition(new JacksonDataFormat())
-  }
 }
 
 object SearchDB {
@@ -42,9 +52,9 @@ object SearchDB {
     val (context, _) = Table.initArgs(args)
     val resHandler = new ResourceHandler()
     resHandler.setResourceBase("src/main/resource")
-    val jdni = new JndiContext()
-    jdni.bind("staticHandler", resHandler)
-    context.setJndiContext(jdni)
+    val jndiContext = new JndiContext()
+    jndiContext.bind("staticHandler", resHandler)
+    context.setJndiContext(jndiContext)
     context.addRoutes(new SearchDB("jetty:http://localhost:8383/", true))
     context.start()
   }