From ce8046bdb48dc560c19f7822fb346dcb2e9400c5 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 30 Dec 2016 11:15:03 -0800 Subject: [PATCH] lib: add some debug output for market prices (#453) --- hledger-lib/Hledger/Reports/BalanceReport.hs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hledger-lib/Hledger/Reports/BalanceReport.hs b/hledger-lib/Hledger/Reports/BalanceReport.hs index 070d7ea54..af96977bb 100644 --- a/hledger-lib/Hledger/Reports/BalanceReport.hs +++ b/hledger-lib/Hledger/Reports/BalanceReport.hs @@ -30,6 +30,7 @@ import Data.List (sort) import Data.Maybe import Data.Time.Calendar import Test.HUnit +import qualified Data.Text as T import Hledger.Data import Hledger.Read (mamountp') @@ -148,8 +149,10 @@ balanceReportValue :: Journal -> Day -> BalanceReport -> BalanceReport balanceReportValue j d r = r' where (items,total) = r - r' = dbg8 "balanceReportValue" - ([(n, n', i, mixedAmountValue j d a) |(n,n',i,a) <- items], mixedAmountValue j d total) + r' = + dbg9 "known market prices" (jmarketprices j) `seq` + dbg8 "balanceReportValue" + ([(n, n', i, mixedAmountValue j d a) |(n,n',i,a) <- items], mixedAmountValue j d total) mixedAmountValue :: Journal -> Day -> MixedAmount -> MixedAmount mixedAmountValue j d (Mixed as) = Mixed $ map (amountValue j d) as @@ -172,11 +175,11 @@ amountValue j d a = -- applicable market price directive before this date). commodityValue :: Journal -> Day -> CommoditySymbol -> Maybe Amount commodityValue j d c - | null applicableprices = Nothing - | otherwise = Just $ mpamount $ last applicableprices + | null applicableprices = dbg Nothing + | otherwise = dbg $ Just $ mpamount $ last applicableprices where applicableprices = [p | p <- sort $ jmarketprices j, mpcommodity p == c, mpdate p <= d] - + dbg = dbg8 ("using market price for "++T.unpack c)