Export a "dtd" function from each XML module and use that instead of hard-coding...

diff --git a/src/Main.hs b/src/Main.hs
index 853c64d0c1df78dd2a4b32b84ead9ea46e90e7a7..648ddae40a22a708d5b0edf8971bb031faae03a7 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -46,14 +46,17 @@ import Network.Services.TSN.Report (
   report_error )
 import TSN.DbImport ( DbImport(..), ImportResult(..) )
 import qualified TSN.XML.AutoRacingSchedule as AutoRacingSchedule (
+  dtd,
   pickle_message )
-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.Scores as Scores ( pickle_message )
-import qualified TSN.XML.Weather as Weather ( pickle_message )
+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.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.Weather as Weather ( dtd, pickle_message )
 import Xml ( DtdName(..), parse_opts )
 
 
@@ -139,7 +142,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
@@ -147,42 +150,42 @@ 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
 
           importer
-            | dtd == "Auto_Racing_Schedule_XML.dtd" = do
+            | dtd == AutoRacingSchedule.dtd = do
                let m = unpickleDoc AutoRacingSchedule.pickle_message xml
-               let errmsg = "Could not unpickle Auto_Racing_Schedule_XML."
                maybe (return $ ImportFailed errmsg) migrate_and_import m
 
-            | dtd == "injuriesxml.dtd" = do
+            | dtd == Injuries.dtd = do
                let m = unpickleDoc Injuries.pickle_message xml
-               let errmsg = "Could not unpickle injuriesxml."
                maybe (return $ ImportFailed errmsg) migrate_and_import m
 
-            | dtd == "Injuries_Detail_XML.dtd" = do
+            | dtd == InjuriesDetail.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 == "newsxml.dtd" = do
+            | dtd == News.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_XML.dtd" = do
+            | dtd == Odds.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 == "weatherxml.dtd" = do
+            | dtd == Scores.dtd = do
+                let m = unpickleDoc Scores.pickle_message xml
+                maybe (return $ ImportFailed errmsg) migrate_and_import m
+
+            | dtd == Weather.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
@@ -190,6 +193,9 @@ import_file cfg path = do
                     "Unrecognized DTD in " ++ path ++ ": " ++ dtd ++ "."
               return $ ImportUnsupported infomsg
 
+            where
+              errmsg = "Could not unpickle " ++ dtd ++ "."
+
 
 -- | Entry point of the program. It twiddles some knobs for
 --   configuration options and then calls 'import_file' on each XML

diff --git a/src/TSN/XML/AutoRacingSchedule.hs b/src/TSN/XML/AutoRacingSchedule.hs
index 27b73ef44fc49a9630719844bba17e8e783aace0..ab1c29ef01db05be044eabb0055eb91635558039 100644 (file)
--- a/src/TSN/XML/AutoRacingSchedule.hs
+++ b/src/TSN/XML/AutoRacingSchedule.hs
@@ -13,6 +13,7 @@
 --   containing \<RaceResultsListing\>s.
 --
 module TSN.XML.AutoRacingSchedule (
+  dtd,
   pickle_message,
   -- * Tests
   auto_racing_schedule_tests,
@@ -67,6 +68,11 @@ import Xml (
   unsafe_unpickle )
 
 
+-- | The DTD to which this module corresponds. Used to invoke dbimport.
+--
+dtd :: String
+dtd = "Auto_Racing_Schedule_XML.dtd"
+
 --
 -- DB/XML data types
 --

diff --git a/src/TSN/XML/Heartbeat.hs b/src/TSN/XML/Heartbeat.hs
index b01e6fb0988c70095f21f8e7d4256e49aa8bb87c..89b91adb4605a35a1b6203c0ec2d578f0488b154 100644 (file)
--- a/src/TSN/XML/Heartbeat.hs
+++ b/src/TSN/XML/Heartbeat.hs
@@ -3,6 +3,7 @@
 -- | Handle documents defined by Heartbeat.dtd.
 --
 module TSN.XML.Heartbeat (
+  dtd,
   verify,
   -- * Tests
   heartbeat_tests )
@@ -27,6 +28,11 @@ import TSN.DbImport ( ImportResult(..) )
 import Xml ( pickle_unpickle, unpickleable )
 
 
+-- | The DTD to which this module corresponds.
+--
+dtd :: String
+dtd = "Heartbeat.dtd"
+
 -- | The data structure that holds the XML representation of a
 --   Heartbeat message.
 --

diff --git a/src/TSN/XML/Injuries.hs b/src/TSN/XML/Injuries.hs
index 81243e44f20f8edd0dbd0f77a46c992379b2132f..af1bc377466d078e71dff41cd73da393d4840200 100644 (file)
--- a/src/TSN/XML/Injuries.hs
+++ b/src/TSN/XML/Injuries.hs
@@ -17,6 +17,7 @@
 --   time_stamp.
 --
 module TSN.XML.Injuries (
+  dtd,
   pickle_message,
   -- * Tests
   injuries_tests,
@@ -72,6 +73,12 @@ import Xml (
   unsafe_unpickle )
 
 
+
+-- | The DTD to which this module corresponds. Used to invoke dbimport.
+--
+dtd :: String
+dtd = "injuriesxml.dtd"
+
 --
 -- DB/XML Data types
 --

diff --git a/src/TSN/XML/InjuriesDetail.hs b/src/TSN/XML/InjuriesDetail.hs
index e5d572e7a504f37f0ed994d1c495bfd55bc41407..4356eb60be9c344267eaea850092d5aed632cac5 100644 (file)
--- a/src/TSN/XML/InjuriesDetail.hs
+++ b/src/TSN/XML/InjuriesDetail.hs
@@ -13,6 +13,7 @@
 --   real meat.
 --
 module TSN.XML.InjuriesDetail (
+  dtd,
   pickle_message,
   -- * Tests
   injuries_detail_tests,
@@ -67,6 +68,13 @@ import Xml (
   unsafe_unpickle )
 
 
+
+-- | The DTD to which this module corresponds. Used to invoke dbimport.
+--
+dtd :: String
+dtd = "Injuries_Detail_XML.dtd"
+
+
 --
 -- Data types
 --

diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs
index 86eed4a8682679abe61c5cc1751375fba1bc3316..49be37e932ea3d7414cdb1ab6b9b1d0263243a5d 100644 (file)
--- a/src/TSN/XML/News.hs
+++ b/src/TSN/XML/News.hs
@@ -11,6 +11,7 @@
 --   a root element \<message\> that contains an entire news item.
 --
 module TSN.XML.News (
+  dtd,
   pickle_message,
   -- * Tests
   news_tests,
@@ -73,6 +74,12 @@ import Xml (
   unsafe_unpickle )
 
 
+-- | The DTD to which this module corresponds. Used to invoke dbimport.
+--
+dtd :: String
+dtd = "newsxml.dtd"
+
+
 --
 -- DB/XML Data types
 --

diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs
index 5d95ca448cc7099979ef2c4638f41c560709db8f..52b7b9f025f5fc1981443523a777776467b954f5 100644 (file)
--- a/src/TSN/XML/Odds.hs
+++ b/src/TSN/XML/Odds.hs
@@ -12,6 +12,7 @@
 --   other... disorganized... information.
 --
 module TSN.XML.Odds (
+  dtd,
   pickle_message,
   -- * Tests
   odds_tests,
@@ -77,6 +78,12 @@ import Xml (
   unsafe_unpickle )
 
 
+-- | The DTD to which this module corresponds. Used to invoke dbimport.
+--
+dtd :: String
+dtd = "Odds_XML.dtd"
+
+
 --
 -- DB/XML data types
 --

diff --git a/src/TSN/XML/Weather.hs b/src/TSN/XML/Weather.hs
index 2561377afebd77f7af1911e2ab47b0e0dc6de732..03bb83d51c3ac3d45dbf9b2f5f974f5968f1d60b 100644 (file)
--- a/src/TSN/XML/Weather.hs
+++ b/src/TSN/XML/Weather.hs
@@ -10,6 +10,7 @@
 --   that league contains a bunch of listings.
 --
 module TSN.XML.Weather (
+  dtd,
   pickle_message,
   -- * Tests
   weather_tests,
@@ -64,6 +65,13 @@ import Xml (
   unsafe_unpickle )
 
 
+
+-- | The DTD to which this module corresponds. Used to invoke dbimport.
+--
+dtd :: String
+dtd = "weatherxml.dtd"
+
+
 --
 -- DB/XML Data types
 --