X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FInjuriesDetail.hs;h=856e800c8998d52bef68b3eaefa15887e417405a;hb=ef96e8bf0cadf5d602022f8c91914d3cabeb35a0;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..856e800 100644
--- a/src/TSN/XML/InjuriesDetail.hs
+++ b/src/TSN/XML/InjuriesDetail.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE QuasiQuotes #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
@@ -18,15 +17,14 @@
 --   are not retained.
 --
 module TSN.XML.InjuriesDetail (
-  Listing ( player_listings ),
-  Message ( listings ),
-  PlayerListing,
-  injuries_detail_tests )
+  injuries_detail_tests,
+  pickle_message )
 where
 
 import Data.Time ( UTCTime )
 import Data.Tuple.Curry ( uncurryN )
-import Database.Groundhog()
+import Database.Groundhog (
+  migrate )
 import Database.Groundhog.TH (
   defaultCodegenConfig,
   groundhog,
@@ -35,7 +33,6 @@ import Test.Tasty ( TestTree, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 import Text.XML.HXT.Core (
   PU,
-  XmlPickler(..),
   xpTriple,
   xp6Tuple,
   xp10Tuple,
@@ -47,9 +44,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 +65,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 +78,7 @@ data Listing =
     player_listings :: [PlayerListing] }
   deriving (Eq, Show)
 
+
 data Message =
   Message {
     xml_file_id :: Int,
@@ -84,10 +89,16 @@ 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
-  dbName: injuries_detail
+  dbName: injuries_detail_player_listings
 |]
 
 
@@ -118,8 +129,6 @@ pickle_player_listing =
                    injured pl,
                    injury_type pl)
 
-instance XmlPickler PlayerListing where
-  xpickle = pickle_player_listing
 
 pickle_listing :: PU Listing
 pickle_listing =
@@ -132,9 +141,6 @@ pickle_listing =
     from_tuple = uncurryN Listing
     to_tuple l = (listing_team_id l, full_name l, player_listings l)
 
-instance XmlPickler Listing where
-  xpickle = pickle_listing
-
 
 pickle_message :: PU Message
 pickle_message =
@@ -155,12 +161,6 @@ pickle_message =
                   listings m,
                   time_stamp m)
 
-instance XmlPickler Message where
-  xpickle = pickle_message
-
-instance DbImport PlayerListing where
-  dbimport = import_generic ( (concatMap player_listings) . listings)
-
 
 -- * Tasty Tests
 injuries_detail_tests :: TestTree
@@ -177,7 +177,7 @@ test_pickle_of_unpickle_is_identity :: TestTree
 test_pickle_of_unpickle_is_identity =
   testCase "pickle composed with unpickle is the identity" $ do
     let path = "test/xml/Injuries_Detail_XML.xml"
-    (expected :: [Message], actual) <- pickle_unpickle "message" path
+    (expected, actual) <- pickle_unpickle pickle_message path
     actual @?= expected