X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FAutoRacingSchedule.hs;h=d4a726b4fc5eece3dadad3dd2b7246b740fabbbf;hb=7d4e1e7142bc3d80efab03d983cb2915d9a893db;hp=01611d237157e0fa52d98fd36406afef7337be0b;hpb=b0a87f9323223a0af538184940b35a081f5763af;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/AutoRacingSchedule.hs b/src/TSN/XML/AutoRacingSchedule.hs
index 01611d2..d4a726b 100644
--- a/src/TSN/XML/AutoRacingSchedule.hs
+++ b/src/TSN/XML/AutoRacingSchedule.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE QuasiQuotes #-}
@@ -38,6 +39,7 @@ import Database.Groundhog.Sqlite ( withSqliteConn )
 import Database.Groundhog.TH (
   groundhog,
   mkPersist )
+import qualified GHC.Generics as GHC ( Generic )
 import Test.Tasty ( TestTree, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 import Text.XML.HXT.Core (
@@ -53,6 +55,7 @@ import Text.XML.HXT.Core (
   xpWrap )
 
 -- Local imports.
+import Generics ( Generic(..), to_tuple )
 import TSN.Codegen (
   tsn_codegen_config )
 import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate )
@@ -105,7 +108,11 @@ data Message =
     xml_complete_through :: String,
     xml_listings :: [AutoRacingScheduleListingXml],
     xml_time_stamp :: UTCTime }
-  deriving (Eq, Show)
+  deriving (Eq, GHC.Generic, Show)
+
+-- | For 'Generics.to_tuple'.
+--
+instance Generic Message
 
 
 instance ToDb Message where
@@ -176,7 +183,11 @@ data AutoRacingScheduleListingXml =
                                 --   so we can't do the right thing and use
                                 --   a 'Double'.
     xml_race_results :: [AutoRacingScheduleListingRaceResult] }
-  deriving (Eq, Show)
+  deriving (Eq, GHC.Generic, Show)
+
+-- | For 'Generics.to_tuple'.
+--
+instance Generic AutoRacingScheduleListingXml
 
 
 -- | Pseudo-accessor to get the race result listings out of a
@@ -266,7 +277,8 @@ data AutoRacingScheduleListingRaceResultRaceResultListing =
     db_leading_laps :: Int,
     db_listing_laps :: Int, -- ^ Avoid clash with race's \"laps\" field.
     db_earnings :: String,  -- ^ This should be an Int, but can have commas.
-    db_status :: String }
+    db_status :: Maybe String -- ^ They can be empty
+    }
 
 
 -- | XML Representation of an
@@ -280,8 +292,13 @@ data AutoRacingScheduleListingRaceResultRaceResultListingXml =
     xml_leading_laps :: Int,
     xml_listing_laps :: Int, -- ^ Avoid clash with race's \"laps\" field.
     xml_earnings :: String,  -- ^ Should be an 'Int', but can have commas.
-    xml_status :: String }
-  deriving (Eq, Show)
+    xml_status :: Maybe String -- ^ They can be empty
+    }
+  deriving (Eq, GHC.Generic, Show)
+
+-- | For 'Generics.to_tuple'.
+--
+instance Generic AutoRacingScheduleListingRaceResultRaceResultListingXml
 
 
 instance ToDb AutoRacingScheduleListingRaceResultRaceResultListingXml where
@@ -318,7 +335,7 @@ instance FromXmlFk AutoRacingScheduleListingRaceResultRaceResultListingXml where
       db_leading_laps = xml_leading_laps,
       db_listing_laps = xml_listing_laps,
       db_earnings = xml_earnings,
-      db_status = xml_earnings }
+      db_status = xml_status }
 
 
 -- | This allows us to insert the XML representation
@@ -361,7 +378,7 @@ mkPersist tsn_codegen_config [groundhog|
   constructors:
     - name: AutoRacingSchedule
       uniques:
-        - name: unique_auto_racing_schedule
+        - name: unique_auto_racing_schedules
           type: constraint
           # Prevent multiple imports of the same message.
           fields: [db_xml_file_id]
@@ -407,14 +424,6 @@ pickle_message =
              (xpElem "time_stamp" xp_time_stamp)
   where
     from_tuple = uncurryN Message
-    to_tuple m = (xml_xml_file_id m,
-                  xml_heading m,
-                  xml_category m,
-                  xml_sport m,
-                  xml_title m,
-                  xml_complete_through m,
-                  xml_listings m,
-                  xml_time_stamp m)
 
 
 -- | Convert an 'AutoRacingScheduleListingXml' to/from XML.
@@ -435,16 +444,7 @@ pickle_listing =
                 (xpList pickle_race_results)
   where
     from_tuple = uncurryN AutoRacingScheduleListingXml
-    to_tuple m = (xml_race_id m,
-                  xml_race_date m,
-                  xml_race_time m,
-                  xml_race_name m,
-                  xml_track_name m,
-                  xml_location m,
-                  xml_tv_listing m,
-                  xml_laps m,
-                  xml_track_length m,
-                  xml_race_results m)
+
 
 
 -- | Convert an 'AutoRacingScheduleListingRaceResult' to/from XML.
@@ -474,19 +474,11 @@ pickle_race_results_listing =
                (xpElem "LeadingLaps" xpInt)
                (xpElem "Laps" xpInt)
                (xpElem "Earnings" xpText)
-               (xpElem "Status" xpText)
+               (xpElem "Status" (xpOption xpText))
   where
     from_tuple =
       uncurryN AutoRacingScheduleListingRaceResultRaceResultListingXml
 
-    to_tuple m = (xml_finish_position m,
-                  xml_driver_id m,
-                  xml_name m,
-                  xml_leading_laps m,
-                  xml_listing_laps m,
-                  xml_earnings m,
-                  xml_status m)
-
 
 --
 -- Tasty Tests