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

lib: allow zero postings in csv reader

Browse Source
This commit is contained in:
Dmitry Astapov 2019-10-15 23:11:53 +01:00
parent 26a4f5e519
commit f92590f92c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -775,8 +775,8 @@ transactionFromCsvRecord sourcepos rules record = t
posting1' = parsePosting "1" posting1' = parsePosting "1"
posting1 = posting1 =
case (postingLegacy,posting1') of case (postingLegacy,posting1') of
(Just legacy, Nothing) -> legacy (Just legacy, Nothing) -> Just legacy
(Nothing, Just posting1) -> posting1 (Nothing, Just posting1) -> Just posting1
(Just legacy, Just posting1) -> (Just legacy, Just posting1) ->
-- Here we merge legacy fields such as "amount" with "amount1", etc -- Here we merge legacy fields such as "amount" with "amount1", etc
-- Account and Comment would be the same by construction -- Account and Comment would be the same by construction
@ -797,16 +797,15 @@ transactionFromCsvRecord sourcepos rules record = t
, "amount/amount-in/amount-out is " ++ showMixedAmount al , "amount/amount-in/amount-out is " ++ showMixedAmount al
, "amount1/amount1-in/amount1-out is " ++ showMixedAmount a1 , "amount1/amount1-in/amount1-out is " ++ showMixedAmount a1
] ]
in posting {paccount=paccount posting1, pamount=amount, ptransaction=Just t', pbalanceassertion=balanceassertion, pcomment = pcomment posting1} in Just $ posting {paccount=paccount posting1, pamount=amount, ptransaction=Just t', pbalanceassertion=balanceassertion, pcomment = pcomment posting1}
(Nothing, Nothing) -> error' $ unlines [ "sadly, no posting was generated for account1, cannot generate transaction" (Nothing, Nothing) -> Nothing
, showRecord record postings' = catMaybes $ posting1:[ parsePosting i | x<-[2..9], let i = show x]
, showRules rules record
]
postings2to9 = catMaybes $ [ parsePosting i | x<-[2..9], let i = show x]
postings = postings =
if postings2to9 == [] case postings' of
then [posting1,posting{paccount="unknown", pamount=missingmixedamt, ptransaction=Just t'}] -- To be compatible with the behavior of the old code which allowed two postings only, we enforce
else posting1:postings2to9 -- second posting when rules generated just one of them.
[posting1] -> [posting1,posting{paccount="unknown", pamount=missingmixedamt, ptransaction=Just t'}]
_ -> postings'
balanced = balanceTransaction Nothing t' balanced = balanceTransaction Nothing t'
t = t =