Enhance the Luxi interface implementation

[ganeti-local] / htools / Ganeti / Query2.hs

diff --git a/htools/Ganeti/Query2.hs b/htools/Ganeti/Query2.hs
index a45407e..f4f9d59 100644 (file)
--- a/htools/Ganeti/Query2.hs
+++ b/htools/Ganeti/Query2.hs
@@ -26,7 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 -}
 
 module Ganeti.Query2
-    ( Filter
+    ( Filter(..)
+    , Query(..)
+    , QueryResult(..)
+    , QueryFields(..)
+    , QueryFieldsResult(..)
+    , FieldDefinition(..)
+    , ResultEntry(..)
     ) where
 
 
@@ -34,7 +40,6 @@ import Text.JSON.Types
 import Text.JSON
 
 import qualified Ganeti.Constants as C
-import Ganeti.HTools.JSON
 import Ganeti.THH
 
 -- * THH declarations, that require ordering.
@@ -101,6 +106,10 @@ data Filter
     | NotFilter Filter -- ^ ! <expression>
     | TrueFilter FilterField -- ^ ? <field>
     | EqualFilter FilterField FilterValue -- ^ (=|!=) <field> <value>
+    | LessThanFilter FilterField FilterValue -- ^ < <field> <value>
+    | GreaterThanFilter FilterField FilterValue -- ^ > <field> <value>
+    | LEThanFilter FilterField FilterValue -- ^ <= <field> <value>
+    | GEThanFilter FilterField FilterValue -- ^ >= <field> <value>
     | RegexpFilter FilterField FilterRegexp -- ^ =~ <field> <regexp>
     | ContainsFilter FilterField FilterValue -- ^ =[] <list-field> <value>