X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FNews.hs;h=a388415ff7109264e418d3338a68faea77654ee1;hb=6ed05f33ffaa8b000d36ab3f5ab62eed4022d27a;hp=49ff8b7d655ff1c41cc2ef1423b79948e4b8731c;hpb=2069d0a786bf2c418f27574f5384eae39527d03f;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs index 49ff8b7..a388415 100644 --- 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)