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

diff --git a/src/Main.hs b/src/Main.hs
index 9e17bbd..0b6dce6 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 )
@@ -57,7 +60,7 @@ import qualified TSN.XML.InjuriesDetail as InjuriesDetail (
 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 )
-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 )
 
@@ -161,10 +164,15 @@ import_file cfg path = do
           migrate_and_import m = dbmigrate m >> dbimport m
 
           importer
+            | dtd == AutoRacingResults.dtd = do
+               let m = unpickleDoc AutoRacingResults.pickle_message xml
+               maybe (return $ ImportFailed errmsg) migrate_and_import m
+
             | dtd == AutoRacingSchedule.dtd = do
                let m = unpickleDoc AutoRacingSchedule.pickle_message xml
                maybe (return $ ImportFailed errmsg) migrate_and_import m
 
+            -- 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
@@ -186,6 +194,7 @@ import_file cfg path = do
                 let m = unpickleDoc Scores.pickle_message xml
                 maybe (return $ ImportFailed errmsg) migrate_and_import m
 
+            -- 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
@@ -198,7 +207,13 @@ 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 =