Begin validating the XML.

Fix a bug in the Injuries pickling.

diff --git a/src/TSN/XML/Injuries.hs b/src/TSN/XML/Injuries.hs
index bea54d3c029deea97f395c4b444d538d9b24ead9..f425f89db33fe828dead2dbd047de18bc753f2ba 100644 (file)
--- a/src/TSN/XML/Injuries.hs
+++ b/src/TSN/XML/Injuries.hs
@@ -96,7 +96,7 @@ pickle_injuries_team :: PU InjuriesTeam
 pickle_injuries_team =
   xpElem "team" $
     xpWrap (from_tuple, to_tuple) $
-    xpPair xpText (xpAttr "league" (xpOption xpText))
+    xpPair xpText (xpOption $ xpAttr "league" xpText)
   where
     from_tuple = uncurryN InjuriesTeam
     to_tuple m = (team_name m, team_league m)

diff --git a/src/Xml.hs b/src/Xml.hs
index e98e4b1c5fc8a5c3251fbafa57182bf0f0eb4cc6..7f641b2fb54d1847215b7733331312c46f5b11b0 100644 (file)
--- a/src/Xml.hs
+++ b/src/Xml.hs
@@ -79,8 +79,7 @@ parse_opts :: SysConfigList
 parse_opts =
   [ withPreserveComment no,
     withRemoveWS yes,
-    withSubstDTDEntities no,
-    withValidate no ]
+    withSubstDTDEntities no ]
 
 
 -- | Given a root element name and a file path, return both the