Use (xpOption xpText) instead of xpText0.

diff --git a/src/TSN/XML/InjuriesDetail.hs b/src/TSN/XML/InjuriesDetail.hs
index c06768ed554c2f9aa399afd948f23838f79ace62..3f8be8f4ccd118caf61fbf1f3a1bc5f8345d4568 100644 (file)
--- a/src/TSN/XML/InjuriesDetail.hs
+++ b/src/TSN/XML/InjuriesDetail.hs
@@ -39,9 +39,9 @@ import Text.XML.HXT.Core (
   xpElem,
   xpInt,
   xpList,
+  xpOption,
   xpPrim,
   xpText,
-  xpText0,
   xpWrap )
 
 import TSN.Picklers( xp_date, xp_team_id )
@@ -60,7 +60,7 @@ data PlayerListing =
     name      :: String,
     injury    :: String,
     status    :: String,
-    fantasy   :: String, -- ^ Nobody knows what this is.
+    fantasy   :: Maybe String, -- ^ Nobody knows what this is.
     injured     :: Bool,
     injury_type :: String -- ^ "type" is a reserved keyword so we can't use it
     }
@@ -121,7 +121,7 @@ pickle_player_listing =
               (xpElem "Name" xpText)
               (xpElem "Injury" xpText)
               (xpElem "Status" xpText)
-              (xpElem "Fantasy" xpText0)
+              (xpElem "Fantasy" $ xpOption xpText)
               (xpElem "Injured" xpPrim)
               (xpElem "Type" xpText)
   where

diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs
index 49ff8b7d655ff1c41cc2ef1423b79948e4b8731c..a388415ff7109264e418d3338a68faea77654ee1 100644 (file)
--- a/src/TSN/XML/News.hs
+++ b/src/TSN/XML/News.hs
@@ -39,7 +39,6 @@ import Text.XML.HXT.Core (
   xpOption,
   xpPair,
   xpText,
-  xpText0,
   xpTriple,
   xpWrap )
 
@@ -114,7 +113,7 @@ data Message =
     xml_mid :: MsgId,
     xml_category :: String,
     xml_sport :: String,
-    xml_url :: String,
+    xml_url :: Maybe String,
     xml_teams :: [NewsTeam],
     xml_locations :: [NewsLocation],
     xml_sms :: String,
@@ -128,7 +127,7 @@ data News =
   News {
     db_mid :: MsgId,
     db_sport :: String,
-    db_url :: String,
+    db_url :: Maybe String,
     db_sms :: String,
     db_editor :: Maybe String,
     db_text :: Maybe String,
@@ -271,7 +270,7 @@ pickle_message =
               pickle_msg_id
               (xpElem "category" xpText)
               (xpElem "sport" xpText)
-              (xpElem "url" xpText0)
+              (xpElem "url" $ xpOption xpText)
               (xpList pickle_news_team)
               (xpList pickle_location)
               (xpElem "SMS" xpText)