htsn-import 0.2.2 → 0.2.3

raw patch · 2 files changed

+12/−4 lines, 2 files

Files

• htsn-import.cabal +1/−1
• src/Main.hs +11/−3

@@ -1,5 +1,5 @@ name:           htsn-import-version:        0.2.2+version:        0.2.3 cabal-version:  >= 1.8 author:         Michael Orlitzky maintainer:	Michael Orlitzky <michael@orlitzky.com>

@@ -110,9 +110,13 @@   results <- parse_and_import `catch` exception_handler   case results of     []    -> do-      -- One of the arrows returned "nothing."-      report_error $ "Unable to determine DTD for file " ++ path ++ "."-      return False+      -- One of the arrows returned "nothing."  Now that we're+      -- validating against the DTDs, this will almost always be+      -- caused by a document whose DTD is not present (i.e. is+      -- unsupported). So we return "success" to allow the XML file to+      -- be deleted.+      report_error $ "No DTD for file " ++ path ++ "."+      return True     (ImportFailed errmsg:_) -> do       report_error $ errmsg ++ " (" ++ path ++ ")"       return False@@ -289,6 +293,10 @@             | otherwise = do               let infomsg =                     "Unrecognized DTD in " ++ path ++ ": " ++ dtd ++ "."+              -- This should be an impossible case while DTD+              -- validation is enabled. If we can parse the file at+              -- all, then we have a DTD for it sitting around. And we+              -- only have DTDs for supported types.               return $ ImportUnsupported infomsg