Skip to content

Commit c5079d4

Browse files
committed
dev:import: call hledgerFieldValue rather than re-implementing it
Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 1424a1f commit c5079d4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

hledger-lib/Hledger/Read/RulesReader.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,7 @@ hledgerField rules record f = fmap
716716

717717
-- | Look up the final value assigned to a hledger field, with csv field
718718
-- references and regular expression match group references interpolated.
719+
hledgerFieldValue :: CsvRules -> CsvRecord -> HledgerFieldName -> Maybe Text
719720
hledgerFieldValue rules record f = (flip fmap) (getEffectiveAssignment rules record f)
720721
$ either (renderTemplate rules record)
721722
$ \cb -> let
@@ -1229,7 +1230,7 @@ getAmount rules record currency p1IsVirtual n =
12291230

12301231
-- assignments to any of these field names with non-empty values
12311232
assignments = [(f,a') | f <- fieldnames
1232-
, Just v <- [T.strip . renderTemplate rules record <$> hledgerField rules record f]
1233+
, Just v <- [T.strip <$> hledgerFieldValue rules record f]
12331234
, not $ T.null v
12341235
-- XXX maybe ignore rule-generated values like "", "-", "$", "-$", "$-" ? cf CSV FORMAT -> "amount", "Setting amounts",
12351236
, let a = parseAmount rules record currency v

0 commit comments

Comments
 (0)