X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=e7f9e9c6213ae8df2b65214d4ff46b69e9b294f5;hb=e88453d996ef8c94d581122309669c5c2aa87c9d;hp=63bde65d78276e6c511f4168217a5f082457b3eb;hpb=fbaea63ea21b5b35d22f43e096e09983b76dcef7;p=dead%2Fhtsn-import.git diff --git a/src/Main.hs b/src/Main.hs index 63bde65..e7f9e9c 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -45,6 +45,10 @@ 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 ) @@ -60,6 +64,9 @@ import qualified TSN.XML.Injuries as Injuries ( dtd, pickle_message ) import qualified TSN.XML.InjuriesDetail as InjuriesDetail ( 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, @@ -191,6 +198,9 @@ import_file cfg path = do (unpickleDoc f xml) importer + | dtd == AutoRacingDriverList.dtd = + go AutoRacingDriverList.pickle_message + | dtd == AutoRacingResults.dtd = go AutoRacingResults.pickle_message @@ -207,6 +217,9 @@ import_file cfg path = do | dtd == JFile.dtd = go JFile.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. @@ -244,7 +257,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 @@ -252,7 +265,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