X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FInjuriesDetail.hs;h=e26cd1ce042f742b2de3f24c4de721688b95aa5f;hb=c792c3bb79e83b5bb8d65984de51f2416b7a2d8e;hp=bb529d0cb5f34e8f0eff496a3b6417ea99269ced;hpb=a163a47ab0aed0072f7868d4b2b28aa4c326e5e1;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/InjuriesDetail.hs b/src/TSN/XML/InjuriesDetail.hs
index bb529d0..e26cd1c 100644
--- a/src/TSN/XML/InjuriesDetail.hs
+++ b/src/TSN/XML/InjuriesDetail.hs
@@ -18,15 +18,14 @@
 --   are not retained.
 --
 module TSN.XML.InjuriesDetail (
-  Listing ( player_listings ),
-  Message ( listings ),
-  PlayerListing,
+  Message,
   injuries_detail_tests )
 where
 
 import Data.Time ( UTCTime )
 import Data.Tuple.Curry ( uncurryN )
-import Database.Groundhog()
+import Database.Groundhog (
+  migrate )
 import Database.Groundhog.TH (
   defaultCodegenConfig,
   groundhog,
@@ -47,9 +46,10 @@ import Text.XML.HXT.Core (
   xpText0,
   xpWrap )
 
-import TSN.DbImport ( DbImport(..), import_generic )
 import TSN.Picklers( xp_date, xp_team_id )
-import Xml ( pickle_unpickle, unpickleable )
+import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate )
+import TSN.XmlImport ( XmlImport(..) )
+import Xml ( FromXml(..), pickle_unpickle, unpickleable )
 
 
 data PlayerListing =
@@ -67,6 +67,12 @@ data PlayerListing =
     }
   deriving (Eq, Show)
 
+instance FromXml PlayerListing where
+  type Db PlayerListing = PlayerListing
+  from_xml = id
+
+instance XmlImport PlayerListing
+
 data Listing =
   Listing {
     listing_team_id :: Int -- ^ Avoid conflict with PlayerListing's team_id
@@ -74,6 +80,7 @@ data Listing =
     player_listings :: [PlayerListing] }
   deriving (Eq, Show)
 
+
 data Message =
   Message {
     xml_file_id :: Int,
@@ -84,6 +91,12 @@ data Message =
     time_stamp :: String }
   deriving (Eq, Show)
 
+instance DbImport Message where
+  dbimport msg = do
+    mapM_ insert_xml (concatMap player_listings $ listings msg)
+    return ImportSucceeded
+
+  dbmigrate _ = run_dbmigrate $ migrate (undefined :: PlayerListing)
 
 mkPersist defaultCodegenConfig [groundhog|
 - entity: PlayerListing
@@ -158,9 +171,6 @@ pickle_message =
 instance XmlPickler Message where
   xpickle = pickle_message
 
-instance DbImport PlayerListing where
-  dbimport = import_generic ( (concatMap player_listings) . listings)
-
 
 -- * Tasty Tests
 injuries_detail_tests :: TestTree