Add a tasty test suite and two tests for the existing XML modules.

[dead/htsn-import.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index e1f40267889c9e4a8a4609cb0a7e7bf9c3b47b95..b81b6f0e25620092672eddaec5bc3868cab00344 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -23,7 +23,6 @@ import System.IO.Error ( catchIOError )
 import Text.XML.HXT.Core (
   ArrowXml,
   IOStateArrow,
-  SysConfigList,
   XmlPickler,
   XmlTree,
   (>>>),
@@ -31,16 +30,10 @@ import Text.XML.HXT.Core (
   getAttrl,
   getText,
   hasName,
-  no,
   readDocument,
   runX,
   unpickleDoc,
-  withPreserveComment,
-  withRemoveWS,
-  withSubstDTDEntities,
-  withValidate,
-  xpickle,
-  yes )
+  xpickle )
 
 import Backend ( Backend(..) )
 import CommandLine ( get_args )
@@ -61,22 +54,7 @@ import qualified TSN.InjuriesDetail as InjuriesDetail (
   Listing ( player_listings ),
   Message ( listings ),
   PlayerListing )
-
-
-
--- | A list of options passed to 'readDocument' when we parse an XML
---   document. We don't validate because the DTDs from TSN are
---   wrong. As a result, we don't want to keep useless DTDs
---   areound. Thus we disable 'withSubstDTDEntities' which, when
---   combined with "withValidate no", prevents HXT from trying to read
---   the DTD at all.
---
-parse_opts :: SysConfigList
-parse_opts =
-  [ withPreserveComment no,
-    withRemoveWS yes,
-    withSubstDTDEntities no,
-    withValidate no ]
+import Xml ( parse_opts )
 
 
 -- | We put the 'Configuration' and 'XmlTree' arguments last so that