Remove more boilerplate in TSN.XML.MLBBoxScore.

[dead/htsn-import.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 63bde65d78276e6c511f4168217a5f082457b3eb..bd5ed5c1cb07e3c17aadd9c0df946bc304040452 100644 (file)
--- 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,12 @@ 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,
@@ -191,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
 
@@ -207,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.
@@ -244,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
@@ -252,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