X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FSportInfo.hs;h=d9931769276a505a6c806ba6c33de576e84bc3b2;hb=71513dc9405d3ca9b630a75d070c669b1e61c2e2;hp=6bb99a2a484474d8f286e4895bcb3fddc46f4583;hpb=6eb1c7477c2d4d3cace6d1b865a5efbec21300a7;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/SportInfo.hs b/src/TSN/XML/SportInfo.hs index 6bb99a2..d993176 100644 --- a/src/TSN/XML/SportInfo.hs +++ b/src/TSN/XML/SportInfo.hs @@ -50,6 +50,7 @@ import TSN.DbImport ( ImportResult(..), run_dbmigrate ) import TSN.Parse ( + ParseError, parse_message, parse_xmlfid, parse_xml_time_stamp ) @@ -161,17 +162,26 @@ dtds = "NCAA_Conference_Schedule_XML.dtd", "nflfirstdownxml.dtd", "NFLFumbleLeaderXML.dtd", + "NFLGrassTurfDomeOutsideXML.dtd", "NFLGiveTakeXML.dtd", "NFLInside20XML.dtd", + "NFLInterceptionLeadersXML.dtd", "NFLKickoffsXML.dtd", "NFLMondayNightXML.dtd", + "NFLPassingLeadersXML.dtd", "NFLPassLeadXML.dtd", "NFLQBStartsXML.dtd", + "NFLReceivingLeadersXML.dtd", + "NFLRushingLeadersXML.dtd", "NFLSackLeadersXML.dtd", "nflstandxml.dtd", + "NFLTackleFFLeadersXML.dtd", "NFLTeamRankingsXML.dtd", + "NFLTopKickoffReturnXML.dtd", "NFLTopPerformanceXML.dtd", + "NFLTopPuntReturnXML.dtd", "NFLTotalYardageXML.dtd", + "NFLYardsXML.dtd", "NFL_KickingLeaders_XML.dtd", "NFL_NBA_Draft_XML.dtd", "NFL_Roster_XML.dtd", @@ -208,12 +218,12 @@ data SportInfo = -- | Attempt to parse a 'SportInfo' from an 'XmlTree'. If we cannot, -- we fail with an error message. -- -parse_xml :: String -> XmlTree -> Either String SportInfo +parse_xml :: String -> XmlTree -> Either ParseError SportInfo parse_xml dtdname xmltree = do xmlfid <- parse_xmlfid xmltree timestamp <- parse_xml_time_stamp xmltree message <- parse_message xmltree - return $ SportInfo dtdname (fromInteger xmlfid) timestamp (xshow [message]) + return $ SportInfo dtdname xmlfid timestamp (xshow [message]) --