X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=da27b12e9a59ebf8a1e27a4c5fd4a13cf42f85cc;hb=1f1b0076266ccb665b7d9470f4ed5f2edbc680a4;hp=6c8223db5628b397405eaeeaec454e571e8ceac8;hpb=ef96e8bf0cadf5d602022f8c91914d3cabeb35a0;p=dead%2Fhtsn-import.git diff --git a/src/Main.hs b/src/Main.hs index 6c8223d..da27b12 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -50,6 +50,7 @@ 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 Xml ( DtdName(..), parse_opts ) @@ -171,6 +172,11 @@ import_file cfg path = do let errmsg = "Could not unpickle Odds_XML." maybe (return $ ImportFailed errmsg) migrate_and_import m + | 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 + | otherwise = do let infomsg = "Unrecognized DTD in " ++ path ++ ": " ++ dtd ++ "." @@ -213,8 +219,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