X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FInjuries.hs;h=3f0fea55e364b066dfe4e95a2979893f4f0e75c0;hb=83bad08d7f28143cdaae42156d951b421fa15a8a;hp=1d1d3149638e72abce975d50983fb195a8028aff;hpb=cb5fd814ce4dbb761ebbff4771f16d97b1910173;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/Injuries.hs b/src/TSN/XML/Injuries.hs
index 1d1d314..3f0fea5 100644
--- a/src/TSN/XML/Injuries.hs
+++ b/src/TSN/XML/Injuries.hs
@@ -64,6 +64,7 @@ import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate )
 import TSN.Picklers ( xp_time_stamp )
 import TSN.XmlImport ( XmlImport(..), XmlImportFk(..) )
 import Xml (
+  Child(..),
   FromXml(..),
   FromXmlFk(..),
   ToDb(..),
@@ -101,7 +102,7 @@ data InjuriesTeam =
 data InjuriesListingXml =
   InjuriesListingXml {
     xml_team :: InjuriesTeam,
-    xml_teamno :: Maybe Int,
+    xml_teamno :: Maybe String, -- ^ Can contain non-numerics, e.g. \"ZR2\"
     xml_injuries :: String,
     xml_updated :: Maybe Bool }
   deriving (Eq, Show)
@@ -114,7 +115,7 @@ data InjuriesListing =
   InjuriesListing {
     db_injuries_id :: DefaultKey Injuries,
     db_team :: InjuriesTeam,
-    db_teamno :: Maybe Int,
+    db_teamno :: Maybe String, -- ^ Can contain non-numerics, e.g. \"ZR2\"
     db_injuries :: String,
     db_updated :: Maybe Bool }
 
@@ -122,10 +123,11 @@ instance ToDb InjuriesListingXml where
   -- | The DB analogue of a 'InjuriesListingXml' is a 'InjuriesListing'
   type Db InjuriesListingXml = InjuriesListing
 
-instance FromXmlFk InjuriesListingXml where
+instance Child InjuriesListingXml where
   -- | Our foreign key points to an 'Injuries'.
   type Parent InjuriesListingXml = Injuries
 
+instance FromXmlFk InjuriesListingXml where
   -- | To convert between a 'InjuriesListingXml' and a
   --   'InjuriesListing', we simply append the foreign key.
   from_xml_fk fk InjuriesListingXml{..} =
@@ -262,7 +264,7 @@ pickle_listing =
   xpElem "listing" $
     xpWrap (from_tuple, to_tuple) $
     xp4Tuple pickle_injuries_team
-             (xpOption $ xpElem "teamno" xpInt)
+             (xpOption $ xpElem "teamno" xpText)
              (xpElem "injuries" xpText)
              (xpOption $ xpElem "updated" xpPrim)
   where