query cleanups

This commit is contained in:
Simon Michael 2012-05-17 16:02:22 +00:00
parent ddda6705c0
commit 2feb36e57f
2 changed files with 5 additions and 2 deletions

View File

@ -15,7 +15,6 @@ module Hledger.Data (
module Hledger.Data.Dates, module Hledger.Data.Dates,
module Hledger.Data.Journal, module Hledger.Data.Journal,
module Hledger.Data.Ledger, module Hledger.Data.Ledger,
module Hledger.Data.Query,
module Hledger.Data.Posting, module Hledger.Data.Posting,
module Hledger.Data.TimeLog, module Hledger.Data.TimeLog,
module Hledger.Data.Transaction, module Hledger.Data.Transaction,
@ -32,7 +31,6 @@ import Hledger.Data.Commodity
import Hledger.Data.Dates import Hledger.Data.Dates
import Hledger.Data.Journal import Hledger.Data.Journal
import Hledger.Data.Ledger import Hledger.Data.Ledger
import Hledger.Data.Query
import Hledger.Data.Posting import Hledger.Data.Posting
import Hledger.Data.TimeLog import Hledger.Data.TimeLog
import Hledger.Data.Transaction import Hledger.Data.Transaction

View File

@ -11,6 +11,7 @@ module Hledger.Data.Query (
QueryOpt(..), QueryOpt(..),
-- * parsing -- * parsing
parseQuery, parseQuery,
simplifyQuery,
-- * accessors -- * accessors
queryIsNull, queryIsNull,
queryStartDate, queryStartDate,
@ -207,6 +208,10 @@ parseBool s = s `elem` truestrings
truestrings :: [String] truestrings :: [String]
truestrings = ["1","t","true"] truestrings = ["1","t","true"]
simplifyQuery :: Query -> Query
simplifyQuery (And [q]) = q
simplifyQuery q = q
-- * accessors -- * accessors
-- | Does this query match everything ? -- | Does this query match everything ?