From 5eb8c41af12f8a044ba2f9d994e1cb449ba93410 Mon Sep 17 00:00:00 2001
From: Rashid Khan <rashidkpc@gmail.com>
Date: Wed, 20 Feb 2013 14:58:40 -0700
Subject: [PATCH] Fixed NOT queries

---
 common/lib/shared.js          | 5 +++--
 panels/fields/micropanel.html | 4 ++--
 panels/fields/module.js       | 4 ++--
 panels/table/module.html      | 2 +-
 panels/table/module.js        | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/lib/shared.js b/common/lib/shared.js
index 78f8989606e..146aeecc1f9 100644
--- a/common/lib/shared.js
+++ b/common/lib/shared.js
@@ -127,13 +127,14 @@ function top_field_values(docs,field,count) {
   }).reverse().slice(0,count)
 }
 
-function add_to_query(original,field,value) {
+function add_to_query(original,field,value,negate) {
+  var not = negate ? "NOT " : "";
   if(value !== '')
     var query = field + ":" + "\"" + addslashes(value.toString()) + "\"";
   else
     var query = "_missing_:" + field;
   var glue = original != "" ? " AND " : "";
-  return original + glue + query;
+  return original + glue + not + query;
 }
  /**
    * Calculate a graph interval
diff --git a/panels/fields/micropanel.html b/panels/fields/micropanel.html
index 4c7ca59e9a3..757e91f6844 100644
--- a/panels/fields/micropanel.html
+++ b/panels/fields/micropanel.html
@@ -13,10 +13,10 @@
   </thead>
   <tbody>
     <tr ng-repeat='field in micropanel.values'>
-      <td>{{field[0]}}</td>
+      <td>{{{true: "__blank__",false:field[0]}[field[0] == ""]}}</td>
       <td>
         <i class="pointer icon-search" ng-click="build_search(micropanel.field,field[0]);dismiss();"></i>
-        <i class="pointer icon-ban-circle" ng-click="build_search('NOT '+micropanel.field,field[0]);dismiss();"></i>
+        <i class="pointer icon-ban-circle" ng-click="build_search(micropanel.field,field[0],true);dismiss();"></i>
       </td>
       <td>{{field[1]}}</td>
     </tr>
diff --git a/panels/fields/module.js b/panels/fields/module.js
index 7ff0799ef3f..534ef8e5cd4 100644
--- a/panels/fields/module.js
+++ b/panels/fields/module.js
@@ -58,8 +58,8 @@ angular.module('kibana.fields', [])
     eventBus.broadcast($scope.$id,$scope.panel.group,"selected_fields",$scope.active)
   }
 
-  $scope.build_search = function(field, value) {
-    $scope.panel.query = add_to_query($scope.panel.query,field,value)
+  $scope.build_search = function(field, value,negate) {
+    $scope.panel.query = add_to_query($scope.panel.query,field,value,negate)
     eventBus.broadcast($scope.$id,$scope.panel.group,'query',$scope.panel.query);
   }
 
diff --git a/panels/table/module.html b/panels/table/module.html
index fb2b7d00c4c..2954058258f 100644
--- a/panels/table/module.html
+++ b/panels/table/module.html
@@ -39,7 +39,7 @@
                 <td>{{key}}</td>
                 <td>
                   <i class='icon-search pointer' ng-click="build_search(key,value)"></i> 
-                  <i class='icon-ban-circle pointer' ng-click="build_search('NOT '+key,value)"></i>
+                  <i class='icon-ban-circle pointer' ng-click="build_search(key,value,true)"></i>
                 </td>
                 <td>{{value}}</td>
               </tr> 
diff --git a/panels/table/module.js b/panels/table/module.js
index 5c03f2a4d7e..8c7313b243b 100644
--- a/panels/table/module.js
+++ b/panels/table/module.js
@@ -67,8 +67,8 @@ angular.module('kibana.table', [])
     $scope.get_data();
   }
 
-  $scope.build_search = function(field, value) {
-    $scope.panel.query = add_to_query($scope.panel.query,field,value)
+  $scope.build_search = function(field, value,negate) {
+    $scope.panel.query = add_to_query($scope.panel.query,field,value,negate)
     $scope.panel.offset = 0;
     $scope.get_data();
     eventBus.broadcast($scope.$id,$scope.panel.group,'query',$scope.panel.query);