a bit more refactoring - warnings can always be reported, even if an …

…error occurs in later tests
poseidon-framework · Dec 8, 2023 · 73763b2 · 73763b2
1 parent cbc66f0
commit 73763b2
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/Poseidon/Janno.hs b/src/Poseidon/Janno.hs
@@ -1012,19 +1012,17 @@ readJannoFileRow jannoPath (lineNumber, row) = do
             return $ Left $ PoseidonFileRowException jannoPath (show lineNumber) betterError
         Right jannoRow -> do
             let (errOrJannoRow, warnings) = W.runWriter (E.runExceptT (checkJannoRowConsistency jannoRow))
+            mapM_ (logWarning . renderWarning) warnings
             case errOrJannoRow of
-                Left e -> return $ Left $
-                    PoseidonFileRowException jannoPath renderLocation e
-                Right r -> do
-                    mapM_ (logWarning . renderWarning) warnings
-                    return $ Right r
-                where
-                    renderWarning :: String -> String
-                    renderWarning e = "Issue in " ++ jannoPath ++ " " ++
-                                      "in line " ++ renderLocation ++ ": " ++ e
-                    renderLocation :: String
-                    renderLocation =  show lineNumber ++
-                                      " (Poseidon_ID: " ++ jPoseidonID jannoRow ++ ")"
+                Left e  -> return $ Left $ PoseidonFileRowException jannoPath renderLocation e
+                Right r -> return $ Right r
+            where
+                renderWarning :: String -> String
+                renderWarning e = "Issue in " ++ jannoPath ++ " " ++
+                                  "in line " ++ renderLocation ++ ": " ++ e
+                renderLocation :: String
+                renderLocation =  show lineNumber ++
+                                  " (Poseidon_ID: " ++ jPoseidonID jannoRow ++ ")"
 
 decodingOptions :: Csv.DecodeOptions
 decodingOptions = Csv.defaultDecodeOptions {