X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FOdds.hs;h=0e84ce6e04111a0245cbe0e47e0d7a05965d8e8a;hb=1313369f569e4a1eecd96a4ac09f533e940d02fa;hp=8061a3e23db2ec2c2eb6c3311ecebcf735fd239e;hpb=1fd949aaaa0798f2e01d649711a4148e31275327;p=dead%2Fhtsn-import.git diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs index 8061a3e..0e84ce6 100644 --- a/src/TSN/XML/Odds.hs +++ b/src/TSN/XML/Odds.hs @@ -187,8 +187,8 @@ instance FromXml OddsGameHomeTeamXml where from_xml OddsGameHomeTeamXml{..} = Team { team_id = xml_home_team_id, - team_abbreviation = Just xml_home_team_abbr, - team_name = Just xml_home_team_name } + abbreviation = Just xml_home_team_abbr, + name = Just xml_home_team_name } -- | This allows us to insert the XML representation -- 'OddsGameHomeTeamXml' directly. @@ -535,15 +535,13 @@ instance DbImport Message where odds_id <- insert_xml m forM_ (xml_games m) $ \g -> do - -- Next, we insert the home and away teams. We do this before - -- inserting the game itself because the game has two foreign keys - -- pointing to "teams". + -- First insert the game, keyed to the "odds", + game_id <- insert_xml_fk odds_id g + + -- Next, we insert the home and away teams. away_team_id <- insert_xml_or_select (xml_away_team g) home_team_id <- insert_xml_or_select (xml_home_team g) - -- Now insert the game, keyed to the "odds", - game_id <- insert_xml_fk odds_id g - -- Insert a record into odds_games__teams mapping the -- home/away teams to this game. Use the full record syntax -- because the types would let us mix up the home/away teams.