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

Merge pull request #126 from adept/master

Browse Source 
Fix for assigning multiple fields in CSV parsing
This commit is contained in:
Simon Michael 2013-06-19 07:11:59 -07:00
commit d913ee96f7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Read/CsvReader.hs
View File

@ -623,9 +623,9 @@ showRecord r = "the CSV record is: "++intercalate ", " (map show r)
getEffectiveAssignment :: CsvRules -> CsvRecord -> JournalFieldName -> Maybe FieldTemplate getEffectiveAssignment :: CsvRules -> CsvRecord -> JournalFieldName -> Maybe FieldTemplate
getEffectiveAssignment rules record f = lastMay $ assignmentsFor f getEffectiveAssignment rules record f = lastMay $ assignmentsFor f
where where
assignmentsFor f = map snd $ toplevelassignments ++ conditionalassignments assignmentsFor f = map snd $ filter ((==f).fst) $ toplevelassignments ++ conditionalassignments
where where
toplevelassignments = filter ((==f).fst) $ rassignments rules toplevelassignments = rassignments rules
conditionalassignments = concatMap snd $ filter blockMatches $ blocksAssigning f conditionalassignments = concatMap snd $ filter blockMatches $ blocksAssigning f
where where
blocksAssigning f = filter (any ((==f).fst) . snd) $ rconditionalblocks rules blocksAssigning f = filter (any ((==f).fst) . snd) $ rconditionalblocks rules

9
tests/read-csv.test
View File

@ -35,3 +35,12 @@
# >>>2 /using conversion rules file.*t.rules/ # >>>2 /using conversion rules file.*t.rules/
# >>>=0 # >>>=0
# 4. handle conditions assigning multiple fields
rm -rf t.rules$$; printf 'fields date, description, amount\ndate-format %%d/%%Y/%%m\ncurrency $\naccount1 assets:myacct\nif Flubber\n account2 acct\n comment cmt' >t.rules$$; echo '10/2009/09,Flubber Co,50' | hledgerdev -f- print --rules-file t.rules$$; rm -rf t.rules$$
>>>
2009/09/10 Flubber Co ;cmt
acct $-50
assets:myacct $50
>>>2 /using conversion rules file.*t.rules/
>>>=0