Fix misleading comments and reorder two operations in JFile/Odds.

diff --git a/src/TSN/XML/JFile.hs b/src/TSN/XML/JFile.hs
index 86565ca59153541a9796aaabe2a2231c0c7f271e..d2ac6f4db7b35f5793f0c3f946622cee5785d824 100644 (file)
--- a/src/TSN/XML/JFile.hs
+++ b/src/TSN/XML/JFile.hs
@@ -387,15 +387,13 @@ instance DbImport Message where
 
     -- Now loop through the message's games
     forM_ (xml_games $ xml_gamelist m) $ \game -> do
+      -- First insert the game, keyed to the "jfile",
+      game_id <- insert_xml_fk msg_id game
 
-      -- 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".
+      -- Next, we insert the home and away teams.
       away_team_id <- insert_xml_or_select (xml_vteam game)
       home_team_id <- insert_xml_or_select (xml_hteam game)
 
-      game_id <- insert_xml_fk msg_id game
-
       -- Insert a record into jfile_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.

diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs
index 8061a3e23db2ec2c2eb6c3311ecebcf735fd239e..2ad2d93ebb14111896f35fe6638b36a3a40cc424 100644 (file)
--- a/src/TSN/XML/Odds.hs
+++ b/src/TSN/XML/Odds.hs
@@ -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.