X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FWeather.hs;h=c1ec2ef0004ff34cd77faf9563896698433f85ef;hb=9a8a222bae7eb08001a99bb693dd20ed8a2693a1;hp=2146c3f6f565597e166244bac8b970e7360b9590;hpb=e96fc68293b6ac51eb0e8a4fe9ac9afa515cca83;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/Weather.hs b/src/TSN/XML/Weather.hs
index 2146c3f..c1ec2ef 100644
--- a/src/TSN/XML/Weather.hs
+++ b/src/TSN/XML/Weather.hs
@@ -13,6 +13,7 @@ module TSN.XML.Weather (
   dtd,
   is_type1,
   pickle_message,
+  teams_are_normal,
   -- * Tests
   weather_tests,
   -- * WARNING: these are private but exported to silence warnings
@@ -45,10 +46,14 @@ import Text.XML.HXT.Core (
   PU,
   XmlTree,
   (/>),
+  (>>>),
+  addNav,
+  descendantAxis,
+  filterAxis,
+  followingSiblingAxis,
   hasName,
-  readDocument,
+  remNav,
   runLA,
-  runX,
   xp8Tuple,
   xp9Tuple,
   xpAttr,
@@ -72,9 +77,9 @@ import Xml (
   FromXml(..),
   FromXmlFk(..),
   ToDb(..),
-  parse_opts,
   pickle_unpickle,
   unpickleable,
+  unsafe_read_document,
   unsafe_unpickle )
 
 
@@ -243,7 +248,7 @@ data WeatherDetailedWeatherListingItem =
     db_home_team :: String,
     db_weather_type :: Int,
     db_description :: String,
-    db_temp_adjust :: String,
+    db_temp_adjust :: Maybe String,
     db_temperature :: Int }
 
 
@@ -259,7 +264,7 @@ data WeatherDetailedWeatherListingItemXml =
     xml_home_team :: String,
     xml_weather_type :: Int,
     xml_description :: String,
-    xml_temp_adjust :: String,
+    xml_temp_adjust :: Maybe String,
     xml_temperature :: Int }
   deriving (Eq, Show)
 
@@ -377,7 +382,8 @@ mkPersist tsn_codegen_config [groundhog|
           reference:
             onDelete: cascade
 
-# We rename the two fields that needed a "dtl" prefix to avoid a name clash.
+  # We rename the two fields that needed a "dtl" prefix to avoid a name
+  # clash.
 - entity: WeatherDetailedWeatherListingItem
   dbName: weather_detailed_items
   constructors:
@@ -420,6 +426,34 @@ is_type1 xmltree =
     elements = parse xmltree
 
 
+-- | Some weatherxml documents even have the Home/Away teams in the
+--   wrong order. We can't parse that! This next bit of voodoo detects
+--   whether or not there are any \<HomeTeam\> elements that are
+--   directly followed by sibling \<AwayTeam\> elements. This is the
+--   opposite of the usual order.
+--
+teams_are_normal :: XmlTree -> Bool
+teams_are_normal xmltree =
+  case elements of
+    [] -> True
+    _  -> False
+  where
+    parse :: XmlTree -> [XmlTree]
+    parse = runLA $  hasName "/"
+                  /> hasName "message"
+                  /> hasName "Detailed_Weather"
+                  /> hasName "DW_Listing"
+                  /> hasName "Item"
+                  >>> addNav
+                  >>> descendantAxis
+                  >>> filterAxis (hasName "HomeTeam")
+                  >>> followingSiblingAxis
+                  >>> remNav
+                  >>> hasName "AwayTeam"
+
+    elements = parse xmltree
+
+
 instance DbImport Message where
   dbmigrate _ =
     run_dbmigrate $ do
@@ -449,6 +483,14 @@ instance DbImport Message where
         -- And finally, insert those DB listings.
         mapM_ insert_ db_listings
 
+    -- Now we do the detailed weather items.
+    case (xml_detailed_weather m) of
+      Nothing -> return ()
+      Just dw -> do
+        let detailed_listings = xml_detailed_listings dw
+        let items = concatMap xml_items detailed_listings
+        mapM_ (insert_xml_fk_ weather_id) items
+
     return ImportSucceeded
 
 
@@ -513,7 +555,7 @@ pickle_item =
              (xpElem "HomeTeam" xpText)
              (xpElem "WeatherType" xpInt)
              (xpElem "Description" xpText)
-             (xpElem "TempAdjust" xpText)
+             (xpElem "TempAdjust" (xpOption xpText))
              (xpElem "Temperature" xpInt)
   where
     from_tuple = uncurryN WeatherDetailedWeatherListingItemXml
@@ -590,7 +632,8 @@ weather_tests =
     [ test_on_delete_cascade,
       test_pickle_of_unpickle_is_identity,
       test_unpickle_succeeds,
-      test_types_detected_correctly ]
+      test_types_detected_correctly,
+      test_normal_teams_detected_correctly ]
 
 
 -- | If we unpickle something and then pickle it, we should wind up
@@ -658,9 +701,12 @@ test_on_delete_cascade = testGroup "cascading delete tests"
       actual @?= expected
 
 
+-- | We want to make sure type1 documents are detected as type1, and
+--   type2 documents detected as type2..
+--
 test_types_detected_correctly :: TestTree
 test_types_detected_correctly =
-  testGroup "weatherxml types detected correctly" $
+  testGroup "weatherxml types detected correctly"
     [ check "test/xml/weatherxml.xml"
             "first type detected correctly"
             True,
@@ -671,11 +717,28 @@ test_types_detected_correctly =
             "second type detected correctly"
             False ]
   where
-    unsafe_get_xmltree :: String -> IO XmlTree
-    unsafe_get_xmltree path =
-      fmap head $ runX $ readDocument parse_opts path
-
     check path desc expected = testCase desc $ do
-      xmltree <- unsafe_get_xmltree path
+      xmltree <- unsafe_read_document path
       let actual = is_type1 xmltree
       actual @?= expected
+
+
+-- | We want to make sure normal teams are detected as normal, and the
+--   backwards ones are flagged as backwards.
+--
+test_normal_teams_detected_correctly :: TestTree
+test_normal_teams_detected_correctly =
+  testGroup "team order is detected correctly" [
+
+    check "normal teams are detected correctly"
+          "test/xml/weatherxml.xml"
+          True,
+
+    check "backwards teams are detected correctly"
+          "test/xml/weatherxml-backwards-teams.xml"
+          False ]
+  where
+    check desc path expected = testCase desc $ do
+      xmltree <- unsafe_read_document path
+      let actual = teams_are_normal xmltree
+      actual @?= expected