Crop the AutoRacingResults dbschema diagram.

Make the Injuries teamno field a String thanks to a new sample.
Update the Injuries dbschema diagram.

diff --git a/doc/dbschema/AutoRacingResultsXML.png b/doc/dbschema/AutoRacingResultsXML.png
index 6048429e3bc55d52072542060bb626a8b7e67739..9ea9386f0ae9fdc2fdcd5b2ef0b479f3dee6c42f 100644 (file)
Binary files a/doc/dbschema/AutoRacingResultsXML.png and b/doc/dbschema/AutoRacingResultsXML.png differ

diff --git a/doc/dbschema/injuriesxml.png b/doc/dbschema/injuriesxml.png
index 8ff6ee5a3d7d8b54c990b0d2f5f5e77ee87fa484..d3e2d50fc0f090576534898ce5d4bbd6de948096 100644 (file)
Binary files a/doc/dbschema/injuriesxml.png and b/doc/dbschema/injuriesxml.png differ

diff --git a/src/TSN/XML/Injuries.hs b/src/TSN/XML/Injuries.hs
index 6af9ad9226feebd20356ab439c1c03a419366dc3..3f0fea55e364b066dfe4e95a2979893f4f0e75c0 100644 (file)
--- a/src/TSN/XML/Injuries.hs
+++ b/src/TSN/XML/Injuries.hs
@@ -102,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)
@@ -115,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 }
 
@@ -264,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