From 6429dcd2920c497c3df08e1ca2cc6de59fb57043 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 2 Jan 2015 16:19:20 -0500 Subject: [PATCH] Migrate TSN.XML.AutoRacingSchedule to fixed-vector-hetero. --- src/TSN/XML/AutoRacingSchedule.hs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/TSN/XML/AutoRacingSchedule.hs b/src/TSN/XML/AutoRacingSchedule.hs index 1cbcbc1..39cfeb9 100644 --- a/src/TSN/XML/AutoRacingSchedule.hs +++ b/src/TSN/XML/AutoRacingSchedule.hs @@ -28,6 +28,7 @@ where import Control.Monad ( forM_ ) import Data.Time ( UTCTime(..) ) import Data.Tuple.Curry ( uncurryN ) +import qualified Data.Vector.HFixed as H ( HVector, cons, convert ) import Database.Groundhog ( countAll, deleteAll, @@ -56,7 +57,6 @@ import Text.XML.HXT.Core ( xpWrap ) -- Local imports. -import Generics ( Generic(..), prepend, to_tuple ) import TSN.Codegen ( tsn_codegen_config ) import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) @@ -111,9 +111,9 @@ data Message = xml_time_stamp :: UTCTime } deriving (Eq, GHC.Generic, Show) --- | For 'Generics.to_tuple'. +-- | For 'H.convert'. -- -instance Generic Message +instance H.HVector Message instance ToDb Message where @@ -186,9 +186,9 @@ data AutoRacingScheduleListingXml = xml_race_results :: [AutoRacingScheduleListingRaceResult] } deriving (Eq, GHC.Generic, Show) --- | For 'Generics.to_tuple'. +-- | For 'H.convert'. -- -instance Generic AutoRacingScheduleListingXml +instance H.HVector AutoRacingScheduleListingXml -- | Pseudo-accessor to get the race result listings out of a @@ -283,9 +283,9 @@ data AutoRacingScheduleListingRaceResultRaceResultListing = } deriving ( GHC.Generic ) --- | For 'Generics.prepend'. +-- | For 'H.cons'. -- -instance Generic AutoRacingScheduleListingRaceResultRaceResultListing +instance H.HVector AutoRacingScheduleListingRaceResultRaceResultListing -- | XML Representation of an @@ -304,9 +304,9 @@ data AutoRacingScheduleListingRaceResultRaceResultListingXml = } deriving (Eq, GHC.Generic, Show) --- | For 'Generics.to_tuple'. +-- | For 'H.convert'. -- -instance Generic AutoRacingScheduleListingRaceResultRaceResultListingXml +instance H.HVector AutoRacingScheduleListingRaceResultRaceResultListingXml instance ToDb AutoRacingScheduleListingRaceResultRaceResultListingXml where @@ -334,7 +334,7 @@ instance FromXmlFk AutoRacingScheduleListingRaceResultRaceResultListingXml where -- 'AutoRacingScheduleListingRaceResultRaceResultListing', we just -- add the foreign key to the parent 'AutoRacingScheduleListing'. -- - from_xml_fk = prepend + from_xml_fk = H.cons -- | This allows us to insert the XML representation @@ -412,7 +412,7 @@ mkPersist tsn_codegen_config [groundhog| pickle_message :: PU Message pickle_message = xpElem "message" $ - xpWrap (from_tuple, to_tuple) $ + xpWrap (from_tuple, H.convert) $ xp8Tuple (xpElem "XML_File_ID" xpInt) (xpElem "heading" xpText) (xpElem "category" xpText) @@ -430,7 +430,7 @@ pickle_message = pickle_listing :: PU AutoRacingScheduleListingXml pickle_listing = xpElem "Listing" $ - xpWrap (from_tuple, to_tuple) $ + xpWrap (from_tuple, H.convert) $ xp10Tuple (xpElem "RaceID" xpInt) (xpElem "Race_Date" xp_date_padded) (xpElem "Race_Time" xp_tba_time) @@ -466,7 +466,7 @@ pickle_race_results_listing :: PU AutoRacingScheduleListingRaceResultRaceResultListingXml pickle_race_results_listing = xpElem "RaceResultsListing" $ - xpWrap (from_tuple, to_tuple) $ + xpWrap (from_tuple, H.convert) $ xp7Tuple (xpElem "FinishPosition" xpInt) (xpElem "DriverID" xpInt) (xpElem "Name" xpText) -- 2.43.2