slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imp:csv: improve debug=7 output from isBlockActive

Browse Source
This commit is contained in:
Simon Michael 2024-12-03 10:45:16 -10:00
parent 786f5dd72a
commit 1010e3dee6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hledger-lib/Hledger/Read/RulesReader.hs
View File

@ -774,7 +774,6 @@ isBlockActive rules record CB{..} = any (all matcherMatches) $ groupedMatchers c
matcherMatches :: Matcher -> Bool matcherMatches :: Matcher -> Bool
matcherMatches (RecordMatcher prefix pat) = maybeNegate prefix origbool matcherMatches (RecordMatcher prefix pat) = maybeNegate prefix origbool
where where
pat' = dbg7 "regex" pat
-- A synthetic whole CSV record to match against. Note, this can be -- A synthetic whole CSV record to match against. Note, this can be
-- different from the original CSV data: -- different from the original CSV data:
-- - any whitespace surrounding field values is preserved -- - any whitespace surrounding field values is preserved
@ -782,12 +781,12 @@ isBlockActive rules record CB{..} = any (all matcherMatches) $ groupedMatchers c
-- - and the field separator is always comma -- - and the field separator is always comma
-- which means that a field containing a comma will look like two fields. -- which means that a field containing a comma will look like two fields.
wholecsvline = dbg7 "wholecsvline" $ T.intercalate "," record wholecsvline = dbg7 "wholecsvline" $ T.intercalate "," record
origbool = regexMatchText pat' wholecsvline origbool = regexMatchText (dbg7 "regex" pat) wholecsvline
matcherMatches (FieldMatcher prefix csvfieldref pat) = maybeNegate prefix origbool matcherMatches (FieldMatcher prefix csvfieldref pat) = maybeNegate prefix origbool
where where
-- the value of the referenced CSV field to match against. -- the value of the referenced CSV field to match against.
csvfieldvalue = dbg7 "csvfieldvalue" $ replaceCsvFieldReference rules record csvfieldref csvfieldvalue = dbg7 "csvfieldvalue" $ replaceCsvFieldReference rules record csvfieldref
origbool = regexMatchText pat csvfieldvalue origbool = regexMatchText (dbg7 "regex" pat) csvfieldvalue
-- | Group matchers into associative pairs based on prefix, e.g.: -- | Group matchers into associative pairs based on prefix, e.g.:
-- A -- A