X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=bd5ed5c1cb07e3c17aadd9c0df946bc304040452;hb=1cecab83b93656aa08ef5128b4e3bd3b6385ac8d;hp=59da41989696a0aabfe9aec446d5968c76d3f4d7;hpb=b63146a890d17e73e5943b427d51fd9311365bb8;p=dead%2Fhtsn-import.git diff --git a/src/Main.hs b/src/Main.hs index 59da419..bd5ed5c 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.MLBBoxScore as MLBBoxScore ( + dtd, + pickle_message ) import qualified TSN.XML.MLBEarlyLine as MLBEarlyLine ( dtd, pickle_message ) @@ -194,6 +201,9 @@ import_file cfg path = do (unpickleDoc f xml) importer + | dtd == AutoRacingDriverList.dtd = + go AutoRacingDriverList.pickle_message + | dtd == AutoRacingResults.dtd = go AutoRacingResults.pickle_message @@ -210,8 +220,9 @@ import_file cfg path = do | dtd == JFile.dtd = go JFile.pickle_message - | dtd == MLBEarlyLine.dtd = - go MLBEarlyLine.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. @@ -250,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 @@ -258,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