X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=90f5f91d9682b5366bbed33d2b00b334b567f0dd;hb=a9a8667246a544705d85698ec967437e4770be2c;hp=9e17bbd6b7aec985855d66839a9f4eae04e5d5cd;hpb=8a744fd3d6f7c9d4f5f4c0e3c2e5128453da779e;p=dead%2Fhtsn-import.git

diff --git a/src/Main.hs b/src/Main.hs
index 9e17bbd..90f5f91 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -45,6 +45,9 @@ import Network.Services.TSN.Report (
   report_info,
   report_error )
 import TSN.DbImport ( DbImport(..), ImportResult(..) )
+import qualified TSN.XML.AutoRacingResults as AutoRacingResults (
+  dtd,
+  pickle_message )
 import qualified TSN.XML.AutoRacingSchedule as AutoRacingSchedule (
   dtd,
   pickle_message )
@@ -54,10 +57,14 @@ import qualified TSN.XML.Injuries as Injuries ( dtd, pickle_message )
 import qualified TSN.XML.InjuriesDetail as InjuriesDetail (
   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.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 )
+import qualified TSN.XML.SportInfo as SportInfo ( dtds, parse_xml )
 import qualified TSN.XML.Weather as Weather ( dtd, pickle_message )
 import Xml ( DtdName(..), parse_opts )
 
@@ -160,35 +167,43 @@ import_file cfg path = do
           --
           migrate_and_import m = dbmigrate m >> dbimport m
 
+          -- | The error message we return if unpickling fails.
+          --
+          errmsg = "Could not unpickle " ++ dtd ++ "."
+
+          -- | Try to migrate and import using the given pickler @f@;
+          --   if it works, return the result. Otherwise, return an
+          --   'ImportFailed' along with our error message.
+          --
+          go f = maybe
+                   (return $ ImportFailed errmsg)
+                   migrate_and_import
+                   (unpickleDoc f xml)
+
           importer
-            | dtd == AutoRacingSchedule.dtd = do
-               let m = unpickleDoc AutoRacingSchedule.pickle_message xml
-               maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == AutoRacingResults.dtd =
+                go AutoRacingResults.pickle_message
 
-            | dtd == Injuries.dtd = do
-               let m = unpickleDoc Injuries.pickle_message xml
-               maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == AutoRacingSchedule.dtd =
+                go AutoRacingSchedule.pickle_message
 
-            | dtd == InjuriesDetail.dtd = do
-                let m = unpickleDoc InjuriesDetail.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            -- GameInfo and SportInfo appear last in the guards
+            | dtd == Injuries.dtd = go Injuries.pickle_message
 
+            | dtd == InjuriesDetail.dtd = go InjuriesDetail.pickle_message
 
-            | dtd == News.dtd = do
-                let m = unpickleDoc News.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == JFile.dtd = go JFile.pickle_message
 
-            | dtd == Odds.dtd = do
-                let m = unpickleDoc Odds.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == News.dtd = go News.pickle_message
 
-            | dtd == Scores.dtd = do
-                let m = unpickleDoc Scores.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == Odds.dtd = go Odds.pickle_message
 
-            | dtd == Weather.dtd = do
-                let m = unpickleDoc Weather.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | 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 `elem` GameInfo.dtds = do
                 let either_m = GameInfo.parse_xml dtd xml
@@ -198,15 +213,19 @@ import_file cfg path = do
                   Left err -> return $ ImportFailed err
                   Right m     -> migrate_and_import m
 
-            | dtd `elem` SportInfo.dtds = undefined
+            | dtd `elem` SportInfo.dtds = do
+                let either_m = SportInfo.parse_xml dtd xml
+                case either_m of
+                  -- This might give us a slightly better error
+                  -- message than the default 'errmsg'.
+                  Left err -> return $ ImportFailed err
+                  Right m     -> migrate_and_import m
 
             | otherwise = do
               let infomsg =
                     "Unrecognized DTD in " ++ path ++ ": " ++ dtd ++ "."
               return $ ImportUnsupported infomsg
 
-            where
-              errmsg = "Could not unpickle " ++ dtd ++ "."
 
 
 -- | Entry point of the program. It twiddles some knobs for