incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [26/27] git commit: Finished refactoring search results
Date Thu, 10 Jul 2014 16:51:12 GMT
Finished refactoring search results


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/044baea5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/044baea5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/044baea5

Branch: refs/heads/apache-blur-0.2
Commit: 044baea5ccac8b9f689309c97a1f3af443f3978d
Parents: 87bc5b5
Author: Chris Rohr <rohr.chris@gmail.com>
Authored: Thu Jul 10 12:27:03 2014 -0400
Committer: Chris Rohr <rohr.chris@gmail.com>
Committed: Thu Jul 10 12:27:03 2014 -0400

----------------------------------------------------------------------
 .../apache/blur/console/util/SearchUtil.java    |    4 -
 .../src/main/webapp/js/blurconsole.model.js     |    5 +
 ...console.043021c43a8a2b7528ad189b100feae0.css | 6476 +++++++++++++++++
 ...console.c5f364360c1d856c03b37938cec9b663.css | 6481 ------------------
 .../src/main/webapp/public/css/blurconsole.css  |    9 +-
 blur-console/src/main/webapp/public/index.html  |    4 +-
 ...rconsole.274d4197822ef71e4cc7823715431b37.js |   27 +
 ...rconsole.4078a9938820234bb792ad296a41fec0.js |   27 +
 ...rconsole.b72cf041e6f5a5d41dae8c6a8b7c6255.js |   27 -
 .../src/main/webapp/public/js/blurconsole.js    |    6 +-
 ...sole.js.5d6d0f5d275efec38fb4d1729a38c5dc.map |    1 -
 ...sole.js.9763f3ccfd44712f79634ab4a7cc7e0a.map |    1 +
 ...sole.js.b069b48c3b15e9eeff1eac4a1c490fdc.map |    1 +
 .../main/webapp/public/js/blurconsole.js.map    |    2 +-
 14 files changed, 6545 insertions(+), 6526 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/044baea5/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
----------------------------------------------------------------------
diff --git a/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java b/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
index dcbed7e..ed99a71 100644
--- a/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
+++ b/blur-console/src/main/java/org/apache/blur/console/util/SearchUtil.java
@@ -48,10 +48,6 @@ public class SearchUtil {
       return fetchRow(table, query, families, remoteHost, securityUser);
     }
 
-    if (families == null || families.length == 0) {
-      return fullTextSearch(table, query, remoteHost, securityUser);
-    }
-
     return searchAndFetch(table, query, rowQuery, start, fetch, families, remoteHost, securityUser);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/044baea5/blur-console/src/main/webapp/js/blurconsole.model.js
----------------------------------------------------------------------
diff --git a/blur-console/src/main/webapp/js/blurconsole.model.js b/blur-console/src/main/webapp/js/blurconsole.model.js
index 4f5511e..b81d8af 100644
--- a/blur-console/src/main/webapp/js/blurconsole.model.js
+++ b/blur-console/src/main/webapp/js/blurconsole.model.js
@@ -423,6 +423,11 @@ blurconsole.model = (function() {
       currentQuery = query;
       currentTable = table;
       currentArgs = $.extend(currentArgs, searchArgs);
+      if (parsedFamilies === null || parsedFamilies.length === 0) {
+        var fams = tables.getFamilies(table);
+        fams.sort();
+        parsedFamilies = [fams[0]];
+      }
       currentArgs.families = parsedFamilies;
       results = {};
 


Mime
View raw message