From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 15 Jun 2014 02:11:54 +0000 (-0400)
Subject: Fix a bug in the earnings pickler and mangle the sample XML document to test it.
X-Git-Tag: 0.0.6~204
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=c3baa2f451e5f4bc7ff33e307bc492d7cb9c3cf0;p=dead%2Fhtsn-import.git

Fix a bug in the earnings pickler and mangle the sample XML document to test it.
---

diff --git a/src/TSN/Picklers.hs b/src/TSN/Picklers.hs
index be4caa6..ea335c8 100644
--- a/src/TSN/Picklers.hs
+++ b/src/TSN/Picklers.hs
@@ -126,7 +126,7 @@ xp_earnings =
     to_earnings :: String -> Maybe Int
     to_earnings s
       | s == "TBA" = Nothing
-      | otherwise = (read . strip_commas . show) s
+      | otherwise = Just  $ (read . strip_commas) s
 
     from_earnings :: Maybe Int -> String
     from_earnings Nothing = "TBA"
diff --git a/test/xml/AutoRacingResultsXML.xml b/test/xml/AutoRacingResultsXML.xml
index 0046b44..956daa4 100644
--- a/test/xml/AutoRacingResultsXML.xml
+++ b/test/xml/AutoRacingResultsXML.xml
@@ -1 +1 @@
-<?xml version="1.0" standalone="no" ?>
<!DOCTYPE message PUBLIC "-//TSN//DTD Leader 1.0/EN" "AutoRacingResultsXML.dtd">
<message>
<XML_File_ID>21162271</XML_File_ID>
<heading>ASX%BUSCH-FINAL-RESULTS</heading>
<category>Statistics</category>
<sport>NASCAR-B</sport>
<RaceID>1716</RaceID>
<RaceDate>5/24/2014 2:45:00 PM</RaceDate>
<Title>NASCAR - Nationwide - History 300 - Final Results</Title>
<Track_Location>Charlotte Motor Speedway - Concord, NC</Track_Location>
<Laps_Remaining>80</Laps_Remaining>
<Checkered_Flag>False</Checkered_Flag>
<Listing>
<FinishPosition>1</FinishPosition>
<StartingPosition>3</StartingPosition>
<CarNumber>42</CarNumber>
<DriverID>965</DriverID>
<Driver>Kyle Larson</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>2</FinishPosition>
<StartingPosition>2</StartingPosition>
<CarNumber>22</CarNumber>
<DriverID>433</DriverID>
<Driver>Brad Keselowski</Driver>
<CarMake>Ford</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>3</FinishPosition>
<StartingPosition>6</StartingPosition>
<CarNumber>2</CarNumber>
<DriverID>1269</DriverID>
<Driver>Brian Scott</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>4</FinishPosition>
<StartingPosition>5</StartingPosition>
<CarNumber>5</CarNumber>
<DriverID>25</DriverID>
<Driver>Kevin Harvick</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>5</FinishPosition>
<StartingPosition>7</StartingPosition>
<CarNumber>20</CarNumber>
<DriverID>28</DriverID>
<Driver>Matt Kenseth</Driver>
<CarMake>Toyota</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>6</FinishPosition>
<StartingPosition>1</StartingPosition>
<CarNumber>54</CarNumber>
<DriverID>304</DriverID>
<Driver>Kyle Busch</Driver>
<CarMake>Toyota</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>7</FinishPosition>
<StartingPosition>8</StartingPosition>
<CarNumber>7</CarNumber>
<DriverID>207</DriverID>
<Driver>Regan Smith</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>8</FinishPosition>
<StartingPosition>16</StartingPosition>
<CarNumber>6</CarNumber>
<DriverID>1343</DriverID>
<Driver>Trevor Bayne</Driver>
<CarMake>Ford</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>9</FinishPosition>
<StartingPosition>13</StartingPosition>
<CarNumber>60</CarNumber>
<DriverID>653</DriverID>
<Driver>Chris Buescher</Driver>
<CarMake>Ford</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>10</FinishPosition>
<StartingPosition>11</StartingPosition>
<CarNumber>3</CarNumber>
<DriverID>1061</DriverID>
<Driver>Ty Dillon</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Race_Information>
<TrackLength KPH="2.414">1.5</TrackLength>
<Laps>200</Laps>
<Most_Laps_Leading>
<DriverID>965</DriverID>
<Driver>Kyle Larson</Driver>
<NumberOfLaps>0</NumberOfLaps>
</Most_Laps_Leading>
</Race_Information>
<time_stamp> May 24, 2014, at 04:18 PM ET </time_stamp>
</message>
\ No newline at end of file
+<?xml version="1.0" standalone="no" ?>
<!DOCTYPE message PUBLIC "-//TSN//DTD Leader 1.0/EN" "AutoRacingResultsXML.dtd">
<message>
<XML_File_ID>21162271</XML_File_ID>
<heading>ASX%BUSCH-FINAL-RESULTS</heading>
<category>Statistics</category>
<sport>NASCAR-B</sport>
<RaceID>1716</RaceID>
<RaceDate>5/24/2014 2:45:00 PM</RaceDate>
<Title>NASCAR - Nationwide - History 300 - Final Results</Title>
<Track_Location>Charlotte Motor Speedway - Concord, NC</Track_Location>
<Laps_Remaining>80</Laps_Remaining>
<Checkered_Flag>False</Checkered_Flag>
<Listing>
<FinishPosition>1</FinishPosition>
<StartingPosition>3</StartingPosition>
<CarNumber>42</CarNumber>
<DriverID>965</DriverID>
<Driver>Kyle Larson</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>123,456</Earnings>
</Listing>
<Listing>
<FinishPosition>2</FinishPosition>
<StartingPosition>2</StartingPosition>
<CarNumber>22</CarNumber>
<DriverID>433</DriverID>
<Driver>Brad Keselowski</Driver>
<CarMake>Ford</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>3</FinishPosition>
<StartingPosition>6</StartingPosition>
<CarNumber>2</CarNumber>
<DriverID>1269</DriverID>
<Driver>Brian Scott</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>4</FinishPosition>
<StartingPosition>5</StartingPosition>
<CarNumber>5</CarNumber>
<DriverID>25</DriverID>
<Driver>Kevin Harvick</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>5</FinishPosition>
<StartingPosition>7</StartingPosition>
<CarNumber>20</CarNumber>
<DriverID>28</DriverID>
<Driver>Matt Kenseth</Driver>
<CarMake>Toyota</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>6</FinishPosition>
<StartingPosition>1</StartingPosition>
<CarNumber>54</CarNumber>
<DriverID>304</DriverID>
<Driver>Kyle Busch</Driver>
<CarMake>Toyota</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>7</FinishPosition>
<StartingPosition>8</StartingPosition>
<CarNumber>7</CarNumber>
<DriverID>207</DriverID>
<Driver>Regan Smith</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>8</FinishPosition>
<StartingPosition>16</StartingPosition>
<CarNumber>6</CarNumber>
<DriverID>1343</DriverID>
<Driver>Trevor Bayne</Driver>
<CarMake>Ford</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>9</FinishPosition>
<StartingPosition>13</StartingPosition>
<CarNumber>60</CarNumber>
<DriverID>653</DriverID>
<Driver>Chris Buescher</Driver>
<CarMake>Ford</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Listing>
<FinishPosition>10</FinishPosition>
<StartingPosition>11</StartingPosition>
<CarNumber>3</CarNumber>
<DriverID>1061</DriverID>
<Driver>Ty Dillon</Driver>
<CarMake>Chevrolet</CarMake>
<Points>0</Points>
<Laps_Completed>120</Laps_Completed>
<Laps_Leading>0</Laps_Leading>
<Status></Status>
<DNF>False</DNF>
<Earnings>TBA</Earnings>
</Listing>
<Race_Information>
<TrackLength KPH="2.414">1.5</TrackLength>
<Laps>200</Laps>
<Most_Laps_Leading>
<DriverID>965</DriverID>
<Driver>Kyle Larson</Driver>
<NumberOfLaps>0</NumberOfLaps>
</Most_Laps_Leading>
</Race_Information>
<time_stamp> May 24, 2014, at 04:18 PM ET </time_stamp>
</message>
\ No newline at end of file