X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=9e17bbd6b7aec985855d66839a9f4eae04e5d5cd;hb=2642b213e183b3dd0620ff88787e2437a9ee8aee;hp=4669b748a610db8ecba3e77abb04ccc99ec7d00e;hpb=dcaa338a8e638ff20890f949fd116fab0228e050;p=dead%2Fhtsn-import.git diff --git a/src/Main.hs b/src/Main.hs index 4669b74..9e17bbd 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -48,7 +48,7 @@ import TSN.DbImport ( DbImport(..), ImportResult(..) ) import qualified TSN.XML.AutoRacingSchedule as AutoRacingSchedule ( dtd, pickle_message ) -import qualified TSN.XML.GameInfo as GameInfo ( dtds ) +import qualified TSN.XML.GameInfo as GameInfo ( dtds, parse_xml ) import qualified TSN.XML.Heartbeat as Heartbeat ( dtd, verify ) import qualified TSN.XML.Injuries as Injuries ( dtd, pickle_message ) import qualified TSN.XML.InjuriesDetail as InjuriesDetail ( @@ -190,7 +190,13 @@ import_file cfg path = do let m = unpickleDoc Weather.pickle_message xml maybe (return $ ImportFailed errmsg) migrate_and_import m - | dtd `elem` GameInfo.dtds = undefined + | dtd `elem` GameInfo.dtds = do + let either_m = GameInfo.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 | dtd `elem` SportInfo.dtds = undefined