X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=0682f8e112cb1537e424849cf227cee8bcaa5024;hb=a3a5a3af1f70b4c5775ca2081cedf95b844238f0;hp=cb4bdffbe5e61f4ff8045e701310693944ff9dd2;hpb=fe55e0de738d00b94ad1269bafe32beb83860387;p=dead%2Fhtsn-import.git

diff --git a/src/Main.hs b/src/Main.hs
index cb4bdff..0682f8e 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -45,20 +45,30 @@ import Network.Services.TSN.Report (
   report_info,
   report_error )
 import TSN.DbImport ( DbImport(..), ImportResult(..) )
+import TSN.Parse ( format_parse_error )
 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.MLBEarlyLine as MLBEarlyLine (
+  dtd,
+  pickle_message )
 import qualified TSN.XML.JFile as JFile ( dtd, pickle_message )
-import qualified TSN.XML.News as News ( dtd, pickle_message )
+import qualified TSN.XML.News as News (
+  dtd,
+  has_only_single_sms,
+  pickle_message )
 import qualified TSN.XML.Odds as Odds ( dtd, pickle_message )
 import qualified TSN.XML.ScheduleChanges as ScheduleChanges (
   dtd,
@@ -191,6 +201,9 @@ import_file cfg path = do
             | 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
 
@@ -198,8 +211,19 @@ import_file cfg path = do
 
             | dtd == JFile.dtd = go JFile.pickle_message
 
-            | dtd == News.dtd = go News.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.
+                -- We already know we can't parse them.
+                if News.has_only_single_sms xml
+                then go News.pickle_message
+                else do
+                  let msg = "Unsupported newsxml.dtd with multiple SMS " ++
+                            "(" ++ path ++ ")"
+                  return $ ImportUnsupported msg
             | dtd == Odds.dtd = go Odds.pickle_message
 
             | dtd == ScheduleChanges.dtd = go ScheduleChanges.pickle_message
@@ -227,7 +251,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
@@ -235,7 +259,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