From c5079d4f1e02a2a3ceb1a06a15531c8a714c9993 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Fri, 1 Mar 2024 18:02:29 +0000 Subject: [PATCH] dev:import: call hledgerFieldValue rather than re-implementing it Signed-off-by: Jonathan Dowland --- hledger-lib/Hledger/Read/RulesReader.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hledger-lib/Hledger/Read/RulesReader.hs b/hledger-lib/Hledger/Read/RulesReader.hs index 1995a2978..d75962e50 100644 --- a/hledger-lib/Hledger/Read/RulesReader.hs +++ b/hledger-lib/Hledger/Read/RulesReader.hs @@ -716,6 +716,7 @@ hledgerField rules record f = fmap -- | Look up the final value assigned to a hledger field, with csv field -- references and regular expression match group references interpolated. +hledgerFieldValue :: CsvRules -> CsvRecord -> HledgerFieldName -> Maybe Text hledgerFieldValue rules record f = (flip fmap) (getEffectiveAssignment rules record f) $ either (renderTemplate rules record) $ \cb -> let @@ -1229,7 +1230,7 @@ getAmount rules record currency p1IsVirtual n = -- assignments to any of these field names with non-empty values assignments = [(f,a') | f <- fieldnames - , Just v <- [T.strip . renderTemplate rules record <$> hledgerField rules record f] + , Just v <- [T.strip <$> hledgerFieldValue rules record f] , not $ T.null v -- XXX maybe ignore rule-generated values like "", "-", "$", "-$", "$-" ? cf CSV FORMAT -> "amount", "Setting amounts", , let a = parseAmount rules record currency v