Make <weather> and <Description> elements optional in TSN.XML.Weather.

[dead/htsn-import.git] / src / TSN / XML / Scores.hs

diff --git a/src/TSN/XML/Scores.hs b/src/TSN/XML/Scores.hs
index 8e9f65f6b2e9689a0ff2071dd72ea324a2d083fe..372f1be9f7e6c47b4f5322d71fdaf48874cc22c3 100644 (file)
--- a/src/TSN/XML/Scores.hs
+++ b/src/TSN/XML/Scores.hs
@@ -61,12 +61,15 @@ import TSN.Database ( insert_or_select )
 import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate )
 import TSN.Location ( Location(..), pickle_location )
 import TSN.Picklers ( xp_time_stamp )
-import TSN.Team ( Team(..), HTeam(..), VTeam(..) )
+import TSN.Team (
+  FromXmlFkTeams(..),
+  HTeam(..),
+  Team(..),
+  VTeam(..) )
 import TSN.XmlImport ( XmlImport(..), XmlImportFkTeams(..) )
 import Xml (
   Child(..),
   FromXml(..),
-  FromXmlFkTeams(..),
   ToDb(..),
   pickle_unpickle,
   unpickleable,
@@ -219,8 +222,8 @@ instance FromXmlFkTeams ScoreGameXml where
       db_home_team_id = fk_home,
       db_away_team_score = xml_away_team_score,
       db_home_team_score = xml_home_team_score,
-      db_away_team_pitcher = (xml_vpitcher $ xml_vteam),
-      db_home_team_pitcher = (xml_hpitcher $ xml_hteam),
+      db_away_team_pitcher = xml_vpitcher xml_vteam,
+      db_home_team_pitcher = xml_hpitcher xml_hteam,
       db_time_r = xml_time_r,
       db_status = xml_status,
       db_notes = xml_notes }