Commit bd8b6659 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/issue-380' into dev

parents c624d176 5f74a8a5
...@@ -591,9 +591,9 @@ parseTsv' bs = (V.toList . V.map tsv2doc . snd) <$> readTsvLazyBS Comma bs ...@@ -591,9 +591,9 @@ parseTsv' bs = (V.toList . V.map tsv2doc . snd) <$> readTsvLazyBS Comma bs
parseTsv' :: BL.ByteString -> Either Text [HyperdataDocument] parseTsv' :: BL.ByteString -> Either Text [HyperdataDocument]
parseTsv' bs = do parseTsv' bs = do
let let
result = case readTsvLazyBS Comma bs of result = case (testCorrectFile bs) of
Left _err -> readTsvLazyBS Tab bs Left _err -> Left _err
Right res -> Right res Right del -> readTsvLazyBS del bs
V.toList . V.map tsv2doc . snd <$> result V.toList . V.map tsv2doc . snd <$> result
parseTsvC :: BL.ByteString parseTsvC :: BL.ByteString
...@@ -601,9 +601,9 @@ parseTsvC :: BL.ByteString ...@@ -601,9 +601,9 @@ parseTsvC :: BL.ByteString
parseTsvC bs = parseTsvC bs =
(\(_h, rs) -> (fromIntegral $ V.length rs, yieldMany rs .| mapC tsv2doc)) <$> eResult (\(_h, rs) -> (fromIntegral $ V.length rs, yieldMany rs .| mapC tsv2doc)) <$> eResult
where where
eResult = case readTsvLazyBS Comma bs of eResult = case (testCorrectFile bs) of
Left _err -> readTsvLazyBS Tab bs Left _err -> Left _err
Right res -> Right res Right del -> readTsvLazyBS del bs
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- Tsv v3 weighted for phylo -- Tsv v3 weighted for phylo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment