X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=bd5ed5c1cb07e3c17aadd9c0df946bc304040452;hb=1cecab83b93656aa08ef5128b4e3bd3b6385ac8d;hp=492f0ceeda96c27fbf1adec1b123cffe2edbde7e;hpb=9b28d5ed0e1570f0890eae1ee01721688c20e266;p=dead%2Fhtsn-import.git diff --git a/src/Main.hs b/src/Main.hs index 492f0ce..bd5ed5c 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -45,18 +45,31 @@ import Network.Services.TSN.Report ( report_info, report_error ) import TSN.DbImport ( DbImport(..), ImportResult(..) ) +import TSN.Parse ( format_parse_error ) +import qualified TSN.XML.AutoRacingDriverList as AutoRacingDriverList ( + dtd, + pickle_message ) import qualified TSN.XML.AutoRacingResults as AutoRacingResults ( dtd, pickle_message ) import qualified TSN.XML.AutoRacingSchedule as AutoRacingSchedule ( dtd, pickle_message ) +import qualified TSN.XML.EarlyLine as EarlyLine ( + dtd, + pickle_message ) import qualified TSN.XML.GameInfo as GameInfo ( dtds, parse_xml ) import qualified TSN.XML.Heartbeat as Heartbeat ( dtd, verify ) import qualified TSN.XML.Injuries as Injuries ( dtd, pickle_message ) import qualified TSN.XML.InjuriesDetail as InjuriesDetail ( dtd, pickle_message ) +import qualified TSN.XML.MLBBoxScore as MLBBoxScore ( + dtd, + pickle_message ) +import qualified TSN.XML.MLBEarlyLine as MLBEarlyLine ( + dtd, + pickle_message ) import qualified TSN.XML.JFile as JFile ( dtd, pickle_message ) import qualified TSN.XML.News as News ( dtd, @@ -188,12 +201,18 @@ import_file cfg path = do (unpickleDoc f xml) importer + | dtd == AutoRacingDriverList.dtd = + go AutoRacingDriverList.pickle_message + | dtd == AutoRacingResults.dtd = go AutoRacingResults.pickle_message | dtd == AutoRacingSchedule.dtd = go AutoRacingSchedule.pickle_message + | dtd == EarlyLine.dtd = + go EarlyLine.pickle_message + -- GameInfo and SportInfo appear last in the guards | dtd == Injuries.dtd = go Injuries.pickle_message @@ -201,6 +220,10 @@ import_file cfg path = do | dtd == JFile.dtd = go JFile.pickle_message + | dtd == MLBBoxScore.dtd = go MLBBoxScore.pickle_message + + | dtd == MLBEarlyLine.dtd = go MLBEarlyLine.pickle_message + | dtd == News.dtd = -- Some of the newsxml docs are busted in predictable ways. -- We want them to "succeed" so that they're deleted. @@ -238,7 +261,7 @@ import_file cfg path = do case either_m of -- This might give us a slightly better error -- message than the default 'errmsg'. - Left err -> return $ ImportFailed err + Left err -> return $ ImportFailed (format_parse_error err) Right m -> migrate_and_import m | dtd `elem` SportInfo.dtds = do @@ -246,7 +269,7 @@ import_file cfg path = do case either_m of -- This might give us a slightly better error -- message than the default 'errmsg'. - Left err -> return $ ImportFailed err + Left err -> return $ ImportFailed (format_parse_error err) Right m -> migrate_and_import m | otherwise = do