X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=a47c669b3544871e0e6bc1413db767fba6bacf66;hb=63bc6e1b491d11d3b79e46a5441c2fb35d5463ae;hp=59da41989696a0aabfe9aec446d5968c76d3f4d7;hpb=b63146a890d17e73e5943b427d51fd9311365bb8;p=dead%2Fhtsn-import.git

diff --git a/src/Main.hs b/src/Main.hs
index 59da419..a47c669 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -45,6 +45,10 @@ import Network.Services.TSN.Report (
   report_info,
   report_error )
 import TSN.DbImport ( DbImport(..), ImportResult(..) )
+import TSN.Parse ( format_parse_error )
+import qualified TSN.XML.AutoRacingDriverList as AutoRacingDriverList (
+  dtd,
+  pickle_message )
 import qualified TSN.XML.AutoRacingResults as AutoRacingResults (
   dtd,
   pickle_message )
@@ -194,6 +198,9 @@ import_file cfg path = do
                    (unpickleDoc f xml)
 
           importer
+            | dtd == AutoRacingDriverList.dtd =
+                go AutoRacingDriverList.pickle_message
+
             | dtd == AutoRacingResults.dtd =
                 go AutoRacingResults.pickle_message
 
@@ -210,8 +217,7 @@ import_file cfg path = do
 
             | dtd == JFile.dtd = go JFile.pickle_message
 
-            | dtd == MLBEarlyLine.dtd =
-                go MLBEarlyLine.pickle_message
+            | dtd == MLBEarlyLine.dtd = go MLBEarlyLine.pickle_message
 
             | dtd == News.dtd =
                 -- Some of the newsxml docs are busted in predictable ways.
@@ -250,7 +256,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
@@ -258,7 +264,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