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

diff --git a/src/Main.hs b/src/Main.hs
index 0b6dce6..38f3930 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -57,6 +57,7 @@ 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.Scores as Scores ( dtd, pickle_message )
@@ -163,41 +164,41 @@ 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 == AutoRacingResults.dtd = do
-               let m = unpickleDoc AutoRacingResults.pickle_message xml
-               maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == AutoRacingResults.dtd =
+                go AutoRacingResults.pickle_message
 
-            | dtd == AutoRacingSchedule.dtd = do
-               let m = unpickleDoc AutoRacingSchedule.pickle_message xml
-               maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == AutoRacingSchedule.dtd =
+                go AutoRacingSchedule.pickle_message
 
-            -- GameInfo and SportInfo appear least in the guards
-            | dtd == Injuries.dtd = do
-               let m = unpickleDoc Injuries.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 = do
-                let m = unpickleDoc InjuriesDetail.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == InjuriesDetail.dtd = go InjuriesDetail.pickle_message
 
+            | dtd == JFile.dtd = go JFile.pickle_message
 
-            | dtd == News.dtd = do
-                let m = unpickleDoc News.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == News.dtd = go News.pickle_message
 
-            | dtd == Odds.dtd = do
-                let m = unpickleDoc Odds.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == Odds.dtd = go Odds.pickle_message
 
-            | dtd == Scores.dtd = do
-                let m = unpickleDoc Scores.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            | dtd == Scores.dtd = go Scores.pickle_message
 
-            -- SportInfo and GameInfo appear least in the guards
-            | dtd == Weather.dtd = do
-                let m = unpickleDoc Weather.pickle_message xml
-                maybe (return $ ImportFailed errmsg) migrate_and_import m
+            -- 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
@@ -220,8 +221,6 @@ import_file cfg path = do
                     "Unrecognized DTD in " ++ path ++ ": " ++ dtd ++ "."
               return $ ImportUnsupported infomsg
 
-            where
-              errmsg = "Could not unpickle " ++ dtd ++ "."
 
 
 -- | Entry point of the program. It twiddles some knobs for