X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=90f5f91d9682b5366bbed33d2b00b334b567f0dd;hb=a9a8667246a544705d85698ec967437e4770be2c;hp=663c51ce0ea206b649ad1565659eeca180b521c2;hpb=4fc769d60f0cac3b4a0cf38add8d8e883583bd61;p=dead%2Fhtsn-import.git diff --git a/src/Main.hs b/src/Main.hs index 663c51c..90f5f91 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -45,12 +45,27 @@ import Network.Services.TSN.Report ( report_info, report_error ) import TSN.DbImport ( DbImport(..), ImportResult(..) ) -import qualified TSN.XML.Heartbeat as Heartbeat ( verify ) -import qualified TSN.XML.Injuries as Injuries ( pickle_message ) -import qualified TSN.XML.InjuriesDetail as InjuriesDetail ( pickle_message ) -import qualified TSN.XML.News as News ( pickle_message ) -import qualified TSN.XML.Odds as Odds ( pickle_message ) -import qualified TSN.XML.Weather as Weather ( pickle_message ) +import qualified TSN.XML.AutoRacingResults as AutoRacingResults ( + dtd, + pickle_message ) +import qualified TSN.XML.AutoRacingSchedule as AutoRacingSchedule ( + dtd, + pickle_message ) +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 ( + 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, parse_xml ) +import qualified TSN.XML.Weather as Weather ( dtd, pickle_message ) import Xml ( DtdName(..), parse_opts ) @@ -136,7 +151,7 @@ import_file cfg path = do import_with_dtd (DtdName dtd,xml) -- We special-case the heartbeat so it doesn't have to run in -- the database monad. - | dtd == "Heartbeat.dtd" = Heartbeat.verify xml + | dtd == Heartbeat.dtd = Heartbeat.verify xml | otherwise = -- We need NoMonomorphismRestriction here. if backend cfg == Postgres @@ -144,38 +159,67 @@ import_file cfg path = do else withSqliteConn cs $ runDbConn importer where -- | Pull the real connection String out of the configuration. + -- cs :: String cs = get_connection_string $ connection_string cfg -- | Convenience; we use this everywhere below in 'importer'. + -- 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 == "injuriesxml.dtd" = do - let m = unpickleDoc Injuries.pickle_message xml - let errmsg = "Could not unpickle injuriesxml." - maybe (return $ ImportFailed errmsg) migrate_and_import m + | dtd == AutoRacingResults.dtd = + go AutoRacingResults.pickle_message + + | dtd == AutoRacingSchedule.dtd = + go AutoRacingSchedule.pickle_message + + -- GameInfo and SportInfo appear last in the guards + | dtd == Injuries.dtd = go Injuries.pickle_message + + | dtd == InjuriesDetail.dtd = go InjuriesDetail.pickle_message - | dtd == "Injuries_Detail_XML.dtd" = do - let m = unpickleDoc InjuriesDetail.pickle_message xml - let errmsg = "Could not unpickle Injuries_Detail_XML." - maybe (return $ ImportFailed errmsg) migrate_and_import m + | dtd == JFile.dtd = go JFile.pickle_message + | dtd == News.dtd = go News.pickle_message - | dtd == "newsxml.dtd" = do - let m = unpickleDoc News.pickle_message xml - let errmsg = "Could not unpickle newsxml." - maybe (return $ ImportFailed errmsg) migrate_and_import m + | dtd == Odds.dtd = go Odds.pickle_message - | dtd == "Odds_XML.dtd" = do - let m = unpickleDoc Odds.pickle_message xml - let errmsg = "Could not unpickle Odds_XML." - maybe (return $ ImportFailed errmsg) migrate_and_import m + | dtd == ScheduleChanges.dtd = go ScheduleChanges.pickle_message - | dtd == "weatherxml.dtd" = do - let m = unpickleDoc Weather.pickle_message xml - let errmsg = "Could not unpickle weatherxml." - maybe (return $ ImportFailed errmsg) migrate_and_import m + | 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 + 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 = 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 = @@ -183,6 +227,7 @@ import_file cfg path = do return $ ImportUnsupported infomsg + -- | Entry point of the program. It twiddles some knobs for -- configuration options and then calls 'import_file' on each XML -- file given on the command-line. @@ -219,8 +264,8 @@ main = do -- deleted. let result_pairs = zip (OC.xml_files opt_config) results let victims = [ p | (p, True) <- result_pairs ] - let imported_count = length victims - report_info $ "Imported " ++ (show imported_count) ++ " document(s) total." + let processed_count = length victims + report_info $ "Processed " ++ (show processed_count) ++ " document(s) total." when (remove cfg) $ mapM_ (kill True) victims where