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

Inline function, add debug statement

Browse Source
This commit is contained in:
Aleksandar Dimitrov 2020-01-05 22:25:49 +01:00 committed by Simon Michael
parent 9011aaa5ba
commit 3ead97975c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,11 +112,6 @@ parseSeparator = specials . map toLower
specials (x:_) = Just x specials (x:_) = Just x
specials [] = Nothing specials [] = Nothing
-- | Decide which separator to get.
-- If the external separator is provided, take it. Otherwise, look at the rules. Finally, return ','.
getSeparator :: CsvRules -> Char
getSeparator rules = maybe ',' id (getDirective "separator" rules >>= parseSeparator)
-- | Read a Journal from the given CSV data (and filename, used for error -- | Read a Journal from the given CSV data (and filename, used for error
-- messages), or return an error. Proceed as follows: -- messages), or return an error. Proceed as follows:
-- @ -- @
@ -158,10 +153,12 @@ readJournalFromCsv mrulesfile csvfile csvdata =
-- parse csv -- parse csv
-- parsec seems to fail if you pass it "-" here TODO: try again with megaparsec -- parsec seems to fail if you pass it "-" here TODO: try again with megaparsec
let parsecfilename = if csvfile == "-" then "(stdin)" else csvfile let parsecfilename = if csvfile == "-" then "(stdin)" else csvfile
let separator = fromMaybe ',' (getDirective "separator" rules >>= parseSeparator)
dbg2IO "separator" separator
records <- (either throwerr id . records <- (either throwerr id .
dbg2 "validateCsv" . validateCsv rules skiplines . dbg2 "validateCsv" . validateCsv rules skiplines .
dbg2 "parseCsv") dbg2 "parseCsv")
`fmap` parseCsv (getSeparator rules) parsecfilename csvdata `fmap` parseCsv separator parsecfilename csvdata
dbg1IO "first 3 csv records" $ take 3 records dbg1IO "first 3 csv records" $ take 3 records
-- identify header lines -- identify header lines