X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=0fe6096e867631e4ea0ddae439324d891fd037f2;hb=f60eab7bde994afb9b2f727e56b0a635413bdd3b;hp=38f393080f9d7f128f1833b32c18199b1888163c;hpb=5b051a15402e5ebbe4e388265dbf8cef6c31df6f;p=dead%2Fhtsn-import.git

diff --git a/src/Main.hs b/src/Main.hs
index 38f3930..0fe6096 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -60,9 +60,12 @@ import qualified TSN.XML.InjuriesDetail as InjuriesDetail (
 import qualified TSN.XML.JFile as JFile ( dtd, pickle_message )
 import qualified TSN.XML.News as News ( dtd, pickle_message )
 import qualified TSN.XML.Odds as Odds ( dtd, pickle_message )
+import qualified TSN.XML.ScheduleChanges as ScheduleChanges (
+  dtd,
+  pickle_message )
 import qualified TSN.XML.Scores as Scores ( dtd, pickle_message )
 import qualified TSN.XML.SportInfo as SportInfo ( dtds, parse_xml )
-import qualified TSN.XML.Weather as Weather ( dtd, pickle_message )
+import qualified TSN.XML.Weather as Weather ( dtd, is_type1, pickle_message )
 import Xml ( DtdName(..), parse_opts )
 
 
@@ -93,7 +96,7 @@ import_file cfg path = do
       report_error $ "Unable to determine DTD for file " ++ path ++ "."
       return False
     (ImportFailed errmsg:_) -> do
-      report_error errmsg
+      report_error $ errmsg ++ " (" ++ path ++ ")"
       return False
     (ImportSkipped infomsg:_) -> do
       -- We processed the message but didn't import anything. Return
@@ -195,10 +198,19 @@ import_file cfg path = do
 
             | dtd == Odds.dtd = go Odds.pickle_message
 
+            | dtd == ScheduleChanges.dtd = go ScheduleChanges.pickle_message
+
             | dtd == Scores.dtd = go Scores.pickle_message
 
             -- SportInfo and GameInfo appear last in the guards
-            | dtd == Weather.dtd = go Weather.pickle_message
+            | dtd == Weather.dtd =
+                if Weather.is_type1 xml
+                then go Weather.pickle_message
+                else do
+                  -- We want these to "succeed" so that they're deleted.
+                  -- We already know we can't parse them.
+                  let msg = "Unsupported weatherxml.dtd type (" ++ path ++ ")"
+                  return $ ImportUnsupported msg
 
             | dtd `elem` GameInfo.dtds = do
                 let either_m = GameInfo.parse_xml dtd xml