diff --git a/doc/TODO b/doc/TODO --- a/doc/TODO +++ b/doc/TODO @@ -5,3 +5,15 @@ longer takes 10 minutes to import (Postgres only?). 3. Add support the the second type of weatherxml (see man page). + +4. There are a few remaining document types that we need to parse + before "version one point oh." This list refers to an + old proprietary implementation, sorry: + + * AutoRaceResultsXML + * jfilexml + * Schedule_Changes_XML + * GameInfoXML + * SportInfoListing + +5. Try mass import of Auto_Racing_Schedule_XML. diff --git a/doc/dbschema/Auto_Racing_Schedule_XML.png b/doc/dbschema/Auto_Racing_Schedule_XML.png new file mode 100644 Binary files /dev/null and b/doc/dbschema/Auto_Racing_Schedule_XML.png differ diff --git a/doc/dbschema/scoresxml.png b/doc/dbschema/scoresxml.png new file mode 100644 Binary files /dev/null and b/doc/dbschema/scoresxml.png differ diff --git a/doc/htsn-importrc.example b/doc/htsn-importrc.example --- a/doc/htsn-importrc.example +++ b/doc/htsn-importrc.example @@ -41,9 +41,10 @@ # How verbose should the logs be? Valid levels are, # -# "INFO", "WARNING", "ERROR" +# "DEBUG", "INFO", "WARNING", "ERROR" # -# (there are others, but we don't emit them.) +# (there are others, but we don't emit them.) The debug output is +# extremely verbose and will not be written to syslog even if you try. # # Default: "INFO" # diff --git a/doc/man1/htsn-import.1 b/doc/man1/htsn-import.1 --- a/doc/man1/htsn-import.1 +++ b/doc/man1/htsn-import.1 @@ -48,16 +48,20 @@ The XML document types obtained from the feed are uniquely identified by their DTDs. We currently support documents with the following DTDs: .IP \[bu] 2 -Heartbeat.dtd +Auto_Racing_Schedule_XML.dtd .IP \[bu] -newsxml.dtd +Heartbeat.dtd .IP \[bu] Injuries_Detail_XML.dtd .IP \[bu] injuriesxml.dtd .IP \[bu] +newsxml.dtd +.IP \[bu] Odds_XML.dtd .IP \[bu] +scoresxml.dtd +.IP \[bu] weatherxml.dtd .SH DATABASE SCHEMA @@ -152,10 +156,11 @@ Default: none .IP \fB\-\-log-level\fR -How verbose should the logs be? We log notifications at three levels: -INFO, WARN, and ERROR. Specify the \(dqmost boring\(dq level of +How verbose should the logs be? We log notifications at four levels: +DEBUG, INFO, WARN, and ERROR. Specify the \(dqmost boring\(dq level of notifications you would like to receive (in all-caps); more -interesting notifications will be logged as well. +interesting notifications will be logged as well. The debug output is +extremely verbose and will not be written to syslog even if you try. Default: INFO diff --git a/htsn-import.cabal b/htsn-import.cabal --- a/htsn-import.cabal +++ b/htsn-import.cabal @@ -1,5 +1,5 @@ name: htsn-import -version: 0.0.2 +version: 0.0.4 cabal-version: >= 1.8 author: Michael Orlitzky maintainer: Michael Orlitzky @@ -16,11 +16,13 @@ doc/TODO makefile schema/*.dtd + schemagen/Auto_Racing_Schedule_XML/*.xml schemagen/Heartbeat/*.xml schemagen/injuriesxml/*.xml schemagen/Injuries_Detail_XML/*.xml schemagen/newsxml/*.xml schemagen/Odds_XML/*.xml + schemagen/scoresxml/*.xml schemagen/weatherxml/*.xml test/shell/*.test test/xml/*.xml @@ -85,8 +87,8 @@ groundhog-th == 0.4.*, MissingH == 1.2.*, old-locale == 1.0.*, - tasty == 0.7.*, - tasty-hunit == 0.4.*, + tasty == 0.8.*, + tasty-hunit == 0.8.*, time == 1.4.*, transformers == 0.3.*, tuple == 0.2.* @@ -109,11 +111,13 @@ TSN.DbImport TSN.Picklers TSN.XmlImport + TSN.XML.AutoRacingSchedule TSN.XML.Heartbeat TSN.XML.Injuries TSN.XML.InjuriesDetail TSN.XML.News TSN.XML.Odds + TSN.XML.Scores TSN.XML.Weather Xml @@ -160,8 +164,8 @@ groundhog-th == 0.4.*, MissingH == 1.2.*, old-locale == 1.0.*, - tasty == 0.7.*, - tasty-hunit == 0.4.*, + tasty == 0.8.*, + tasty-hunit == 0.8.*, time == 1.4.*, transformers == 0.3.*, tuple == 0.2.* @@ -232,8 +236,8 @@ MissingH == 1.2.*, old-locale == 1.0.*, process == 1.1.*, - tasty == 0.7.*, - tasty-hunit == 0.4.*, + tasty == 0.8.*, + tasty-hunit == 0.8.*, time == 1.4.*, transformers == 0.3.*, tuple == 0.2.* diff --git a/makefile b/makefile --- a/makefile +++ b/makefile @@ -43,7 +43,7 @@ # dist: runghc Setup.hs configure --prefix=/ - runghc Setup.hs sdist + TAR_OPTIONS="--format=ustar" runghc Setup.hs sdist hlint: hlint --ignore="Use camelCase" \ diff --git a/schema/Auto_Racing_Schedule_XML.dtd b/schema/Auto_Racing_Schedule_XML.dtd new file mode 100644 --- /dev/null +++ b/schema/Auto_Racing_Schedule_XML.dtd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schema/scoresxml.dtd b/schema/scoresxml.dtd new file mode 100644 --- /dev/null +++ b/schema/scoresxml.dtd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemagen/Auto_Racing_Schedule_XML/20136714.xml b/schemagen/Auto_Racing_Schedule_XML/20136714.xml new file mode 100644 --- /dev/null +++ b/schemagen/Auto_Racing_Schedule_XML/20136714.xml @@ -0,0 +1,1 @@ + 20136714 BFX%SCHEDULE Statistics NASCAR 2013 NASCAR Sprint Cup Schedule Complete through 1492 02/16/2013 08:10 PM Sprint Unlimited at Daytona Daytona International Speedway Daytona Beach, FL FOX 75 2.5 1 25 Kevin Harvick 40 75 205,075 Running 2 49 Greg Biffle 2 75 101,325 Running 3 1306 Joey Logano 0 75 61,325 Running 4 43 Tony Stewart 5 75 52,325 Running 5 28 Matt Kenseth 26 75 51,300 Running 1493 02/21/2013 02:00 PM Budweiser Duel 1 Daytona International Speedway Daytona Beach, FL SPEED 60 2.5 1 25 Kevin Harvick 23 60 57,792 Running 2 49 Greg Biffle 0 60 42,789 Running 3 59 Juan Pablo Montoya 0 60 37,789 Running 4 27 Jimmie Johnson 0 60 23,789 Running 5 18 Kurt Busch 0 60 30,789 Running 1494 02/21/2013 04:00 PM Budweiser Duel 2 Daytona International Speedway Daytona Beach, FL SPEED 60 2.5 1 304 Kyle Busch 19 60 58,977 Running 2 109 Kasey Kahne 0 60 43,963 Running 3 1321 Austin Dillon 0 60 38,963 Running 4 431 Clint Bowyer 1 60 33,963 Running 5 28 Matt Kenseth 0 60 31,963 Running 1495 02/24/2013 01:00 PM Daytona 500 Daytona International Speedway Daytona Beach, FL FOX 200 2.5 1 27 Jimmie Johnson 17 200 1,525,275 Running 2 20 Dale Earnhardt Jr. 0 200 1,104,814 Running 3 32 Mark Martin 0 200 817,013 Running 4 433 Brad Keselowski 13 200 707,855 Running 5 47 Ryan Newman 3 200 578,471 Running 1496 03/03/2013 03:00 PM Subway Fresh Fit 500 Phoenix International Raceway Avondale, AZ FOX 316 1.0 1 127 Carl Edwards 122 316 298,875 Running 2 27 Jimmie Johnson 1 316 209,686 Running 3 490 Denny Hamlin 0 316 157,575 Running 4 433 Brad Keselowski 16 316 168,076 Running 5 20 Dale Earnhardt Jr. 47 316 130,750 Running 1497 03/10/2013 03:00 PM Kobalt Tools 400 Las Vegas Motor Speedway Las Vegas, NV FOX 267 1.5 1 28 Matt Kenseth 42 267 408,666 Running 2 109 Kasey Kahne 114 267 284,340 Running 3 433 Brad Keselowski 12 267 248,956 Running 4 304 Kyle Busch 27 267 208,698 Running 5 127 Carl Edwards 0 267 180,590 Running 1498 03/17/2013 01:00 PM Food City 500 Bristol Motor Speedway Bristol, TN FOX 500 0.533 1 109 Kasey Kahne 109 500 176,760 Running 2 304 Kyle Busch 56 500 188,893 Running 3 433 Brad Keselowski 62 500 168,651 Running 4 18 Kurt Busch 1 500 134,255 Running 5 431 Clint Bowyer 0 500 144,543 Running 1499 03/24/2013 03:00 PM Auto Club 400 Auto Club Speedway Fontana, CA FOX 200 2.0 1 304 Kyle Busch 125 200 334,233 Running 2 20 Dale Earnhardt Jr. 0 200 212,340 Running 3 1306 Joey Logano 41 200 193,673 Running 4 127 Carl Edwards 0 200 181,815 Running 5 18 Kurt Busch 0 200 146,585 Running 1500 04/07/2013 01:00 PM STP Gas Booster 500 Martinsville Speedway Martinsville, VA FOX 500 0.526 1 27 Jimmie Johnson 346 500 214,471 Running 2 431 Clint Bowyer 0 500 164,893 Running 3 22 Jeff Gordon 0 500 146,446 Running 4 109 Kasey Kahne 0 500 112,385 Running 5 304 Kyle Busch 56 500 145,278 Running 1501 04/13/2013 07:30 PM NRA 500 Texas Motor Speedway Fort Worth, TX FOX 334 1.5 1 304 Kyle Busch 171 334 550,858 Running 2 266 Martin Truex Jr. 142 334 346,555 Running 3 127 Carl Edwards 0 334 268,605 Running 4 49 Greg Biffle 0 334 214,855 Running 5 1306 Joey Logano 1 334 209,913 Running 1502 04/21/2013 01:00 PM STP 400 Kansas Speedway Kansas City, KS FOX 267 1.5 1 28 Matt Kenseth 163 267 263,816 Running 2 109 Kasey Kahne 0 267 182,085 Running 3 27 Jimmie Johnson 9 267 185,021 Running 4 266 Martin Truex Jr. 46 267 155,985 Running 5 431 Clint Bowyer 0 267 156,218 Running 1503 04/27/2013 07:30 PM Toyota Owners 400 Richmond International Raceway Richmond, VA FOX 406 0.75 1 25 Kevin Harvick 3 406 242,511 Running 2 431 Clint Bowyer 113 406 196,668 Running 3 1306 Joey Logano 0 406 161,618 Running 4 59 Juan Pablo Montoya 67 406 147,474 Running 5 16 Jeff Burton 7 406 118,435 Running 1504 05/05/2013 01:00 PM Aaron's 499 Talladega Superspeedway Talladega, AL FOX 192 2.66 1 455 David Ragan 4 192 373,108 Running 2 399 David Gilliland 0 192 235,153 Running 3 127 Carl Edwards 5 192 207,720 Running 4 46 Michael Waltrip 0 192 155,620 Running 5 27 Jimmie Johnson 16 192 181,426 Running 1505 05/11/2013 07:00 PM Bojangles Southern 500 Darlington Raceway Darlington, SC FOX 367 1.366 1 28 Matt Kenseth 17 367 314,866 Running 2 490 Denny Hamlin 0 367 211,465 Running 3 22 Jeff Gordon 16 367 200,026 Running 4 27 Jimmie Johnson 0 367 178,876 Running 5 25 Kevin Harvick 0 367 165,976 Running 1506 05/18/2013 07:30 PM Sprint Showdown Charlotte Motor Speedway Concord, NC SPEED 40 1.5 1 34 Jamie McMurray 40 40 50,915 Running 2 1341 Ricky Stenhouse Jr. 0 40 40,915 Running 3 16 Jeff Burton 0 40 36,640 Running 4 310 Paul Menard 0 40 34,540 Running 5 266 Martin Truex Jr. 0 40 33,540 Running 1507 05/18/2013 09:00 PM NASCAR Sprint All-Star Race Charlotte Motor Speedway Concord, NC SPEED 90 1.5 1 27 Jimmie Johnson 10 90 1,039,175 Running 2 1306 Joey Logano 0 90 244,175 Running 3 304 Kyle Busch 29 90 144,175 Running 4 109 Kasey Kahne 11 90 114,150 Running 5 18 Kurt Busch 29 90 109,150 Running 1508 05/26/2013 06:00 PM Coca-Cola 600 Charlotte Motor Speedway Concord, NC FOX 400 1.5 1 25 Kevin Harvick 28 400 407,011 Running 2 109 Kasey Kahne 161 400 291,615 Running 3 18 Kurt Busch 8 400 218,560 Running 4 490 Denny Hamlin 6 400 220,915 Running 5 1306 Joey Logano 0 400 174,823 Running 1509 06/02/2013 01:00 PM FedEx 400 Dover International Speedway Dover, DE FOX 400 1.0 1 43 Tony Stewart 139 400 318,100 Running 2 59 Juan Pablo Montoya 19 400 226,504 Running 3 22 Jeff Gordon 0 400 203,051 Running 4 304 Kyle Busch 150 400 196,198 Running 5 433 Brad Keselowski 2 400 177,431 Running 1510 06/09/2013 01:00 PM Party in the Poconos 400 Pocono Raceway Long Pond, PA TNT 160 2.5 1 27 Jimmie Johnson 128 160 244,436 Running 2 49 Greg Biffle 0 160 179,185 Running 3 20 Dale Earnhardt Jr. 0 160 143,060 Running 4 43 Tony Stewart 0 160 165,810 Running 5 47 Ryan Newman 19 160 144,343 Running 1511 06/16/2013 01:00 PM Quicken Loans 400 Michigan International Speedway Brooklyn, MI TNT 200 2.0 1 49 Greg Biffle 48 200 240,460 Running 2 25 Kevin Harvick 0 200 173,781 Running 3 266 Martin Truex Jr. 0 200 145,670 Running 4 304 Kyle Busch 0 200 148,803 Running 5 43 Tony Stewart 0 200 142,085 Running 1513 06/23/2013 03:00 PM Toyota/Save Mart 350 Sonoma Raceway Sonoma, CA TNT 110 1.99 1 266 Martin Truex Jr. 51 110 309,250 Running 2 22 Jeff Gordon 4 110 240,451 Running 3 127 Carl Edwards 0 110 198,140 Running 4 18 Kurt Busch 15 110 154,860 Running 5 431 Clint Bowyer 0 110 157,548 Running 1514 06/30/2013 12:00 PM Quaker State 400 Kentucky Speedway Sparta, KY TNT 267 1.5 1 28 Matt Kenseth 38 267 200,451 Running 2 34 Jamie McMurray 0 267 159,115 Running 3 431 Clint Bowyer 0 267 146,078 Running 4 1306 Joey Logano 0 267 130,338 Running 5 304 Kyle Busch 0 267 139,743 Running 1515 07/06/2013 07:30 PM Coke Zero 400 Daytona International Speedway Daytona Beach, FL TNT 161 2.5 1 27 Jimmie Johnson 94 161 327,961 Running 2 43 Tony Stewart 0 161 254,490 Running 3 25 Kevin Harvick 0 161 224,301 Running 4 431 Clint Bowyer 0 161 182,073 Running 5 46 Michael Waltrip 0 161 141,365 Running 1516 07/14/2013 01:00 PM Camping World RV Sales 301 New Hampshire Motor Speedway Loudon, NH TNT 302 1.058 1 118 Brian Vickers 16 302 214,075 Running 2 304 Kyle Busch 53 302 228,043 Running 3 16 Jeff Burton 0 302 147,135 Running 4 433 Brad Keselowski 14 302 179,076 Running 5 580 Aric Almirola 0 302 152,496 Running 1517 07/28/2013 01:00 PM Crown Royal 400 at the Brickyard Indianapolis Motor Speedway Indianapolis, IN ESPN 160 2.5 1 47 Ryan Newman 45 160 423,033 Running 2 27 Jimmie Johnson 73 160 379,736 Running 3 109 Kasey Kahne 0 160 299,500 Running 4 43 Tony Stewart 0 160 300,650 Running 5 28 Matt Kenseth 0 160 273,266 Running 1518 08/04/2013 01:00 PM GoBowling.com 400 Pocono Raceway Long Pond, PA ESPN 160 2.5 1 109 Kasey Kahne 66 160 208,500 Running 2 22 Jeff Gordon 7 160 199,221 Running 3 18 Kurt Busch 9 160 153,930 Running 4 47 Ryan Newman 2 160 161,343 Running 5 20 Dale Earnhardt Jr. 2 160 130,585 Running 1519 08/11/2013 01:00 PM Cheez-It 355 at the Glen Watkins Glen International Watkins Glen, NY ESPN 90 2.45 1 304 Kyle Busch 29 90 236,658 Running 2 433 Brad Keselowski 0 90 204,876 Running 3 266 Martin Truex Jr. 0 90 161,735 Running 4 127 Carl Edwards 0 90 149,360 Running 5 59 Juan Pablo Montoya 1 90 137,524 Running 1520 08/18/2013 01:00 PM Pure Michigan 400 Michigan International Speedway Brooklyn, MI ESPN 200 2.0 1 1306 Joey Logano 51 200 252,393 Running 2 25 Kevin Harvick 0 200 180,731 Running 3 18 Kurt Busch 43 200 136,315 Running 4 310 Paul Menard 0 200 143,486 Running 5 431 Clint Bowyer 0 200 145,493 Running 1521 08/24/2013 07:30 PM IRWIN Tools Night Race Bristol Motor Speedway Bristol, TN ABC 500 0.533 1 28 Matt Kenseth 149 500 328,466 Running 2 109 Kasey Kahne 0 500 214,815 Running 3 59 Juan Pablo Montoya 0 500 200,529 Running 4 118 Brian Vickers 0 500 150,315 Running 5 1306 Joey Logano 0 500 155,973 Running 1522 09/01/2013 07:30 PM AdvoCare 500 Atlanta Motor Speedway Hampton, GA ESPN 325 1.54 1 304 Kyle Busch 36 325 338,058 Running 2 1306 Joey Logano 78 325 244,473 Running 3 266 Martin Truex Jr. 0 325 207,065 Running 4 18 Kurt Busch 0 325 165,235 Running 5 47 Ryan Newman 3 325 167,848 Running 1523 09/07/2013 07:30 PM Federated Auto Parts 400 Richmond International Raceway Richmond, VA ABC 400 0.75 1 127 Carl Edwards 46 400 286,475 Running 2 18 Kurt Busch 73 400 185,355 Running 3 47 Ryan Newman 4 400 181,443 Running 4 34 Jamie McMurray 6 400 151,805 Running 5 310 Paul Menard 3 400 140,701 Running 1524 09/15/2013 02:00 PM GEICO 400 Chicagoland Speedway Joliet, IL ESPN 267 1.5 1 28 Matt Kenseth 89 267 334,891 Running 2 304 Kyle Busch 67 267 261,048 Running 3 25 Kevin Harvick 2 267 221,326 Running 4 18 Kurt Busch 0 267 169,960 Running 5 27 Jimmie Johnson 40 267 176,926 Running 1525 09/22/2013 02:00 PM Sylvania 300 New Hampshire Motor Speedway Loudon, NH ESPN 300 1.058 1 28 Matt Kenseth 106 300 262,066 Running 2 304 Kyle Busch 0 300 210,143 Running 3 49 Greg Biffle 0 300 151,785 Running 4 27 Jimmie Johnson 1 300 160,796 Running 5 34 Jamie McMurray 0 300 142,005 Running 1526 09/29/2013 02:00 PM AAA 400 Dover International Speedway Dover, DE ESPN 400 1.0 1 27 Jimmie Johnson 243 400 243,836 Running 2 20 Dale Earnhardt Jr. 80 400 197,210 Running 3 1306 Joey Logano 0 400 166,068 Running 4 22 Jeff Gordon 3 400 168,296 Running 5 304 Kyle Busch 30 400 162,068 Running 1527 10/06/2013 02:00 PM Hollywood Casino 400 Kansas Speedway Kansas City, KS ESPN 267 1.5 1 25 Kevin Harvick 138 267 364,636 Running 2 18 Kurt Busch 0 267 229,810 Running 3 22 Jeff Gordon 0 267 216,776 Running 4 1306 Joey Logano 33 267 176,473 Running 5 127 Carl Edwards 0 267 169,965 Running 1528 10/12/2013 07:30 PM Bank of America 500 Charlotte Motor Speedway Concord, NC ABC 334 1.5 1 433 Brad Keselowski 11 334 314,441 Running 2 109 Kasey Kahne 138 334 224,810 Running 3 28 Matt Kenseth 1 334 199,426 Running 4 27 Jimmie Johnson 130 334 192,721 Running 5 304 Kyle Busch 4 334 163,568 Running 1529 10/20/2013 02:00 PM Camping World RV Sales 500 Talladega Superspeedway Talladega, AL ESPN 188 2.66 1 34 Jamie McMurray 16 188 236,345 Running 2 20 Dale Earnhardt Jr. 38 188 185,410 Running 3 1341 Ricky Stenhouse Jr. 6 188 187,596 Running 4 310 Paul Menard 0 188 154,726 Running 5 304 Kyle Busch 9 188 162,068 Running 1530 10/27/2013 02:00 PM Goody's Headache Relief Shot 500 Martinsville Speedway Ridgeway, VA ESPN 500 0.526 1 22 Jeff Gordon 78 500 188,796 Running 2 28 Matt Kenseth 202 500 177,736 Running 3 431 Clint Bowyer 60 500 141,478 Running 4 433 Brad Keselowski 0 500 153,436 Running 5 27 Jimmie Johnson 123 500 144,046 Running 1531 11/03/2013 03:00 PM AAA Texas 500 Texas Motor Speedway Fort Worth, TX ESPN 334 1.5 1 27 Jimmie Johnson 255 334 484,211 Running 2 20 Dale Earnhardt Jr. 0 334 337,810 Running 3 1306 Joey Logano 1 334 256,393 Running 4 28 Matt Kenseth 3 334 238,776 Running 5 109 Kasey Kahne 0 334 180,585 Running 1532 11/10/2013 03:00 PM AdvoCare 500 Phoenix International Raceway Avondale, AZ ESPN 312 1.0 1 25 Kevin Harvick 70 312 263,386 Running 2 109 Kasey Kahne 41 312 171,715 Running 3 27 Jimmie Johnson 1 312 182,326 Running 4 20 Dale Earnhardt Jr. 2 312 131,135 Running 5 18 Kurt Busch 0 312 137,630 Running 1533 11/17/2013 03:00 PM Ford EcoBoost 400 Homestead-Miami Speedway Homestead, FL ESPN 267 1.5 1 490 Denny Hamlin 72 267 322,350 Running 2 28 Matt Kenseth 144 267 293,251 Running 3 20 Dale Earnhardt Jr. 28 267 203,860 Running 4 266 Martin Truex Jr. 0 267 179,435 Running 5 431 Clint Bowyer 0 267 167,968 Running January 13, 2014, at 11:34 AM ET diff --git a/schemagen/scoresxml/20160114.xml b/schemagen/scoresxml/20160114.xml new file mode 100644 --- /dev/null +++ b/schemagen/scoresxml/20160114.xml @@ -0,0 +1,1 @@ + 20160114 BC-ADi+129:143* 0 0 0 18166 18166 Scores NHL Montreal QUEBEC CANADA Ottawa ONTARIO CANADA Regular Montreal Ottawa 0 0 0 Period Ottawa - Right Wing Chris Neil (1/16, lower body) is probable for Thursday's game against Montreal. January 16, 2014, at 10:39 AM ET diff --git a/schemagen/scoresxml/20160285.xml b/schemagen/scoresxml/20160285.xml new file mode 100644 --- /dev/null +++ b/schemagen/scoresxml/20160285.xml @@ -0,0 +1,1 @@ + 20160285 BC-BLP+P26:P56* 7 7 1R14:56 50719 50719 Scores CBASK-W Regular Campbell Gardner-Webb 7 7 14:56 1 Half January 16, 2014, at 11:17 AM ET diff --git a/schemagen/scoresxml/20187479.xml b/schemagen/scoresxml/20187479.xml new file mode 100644 --- /dev/null +++ b/schemagen/scoresxml/20187479.xml @@ -0,0 +1,1 @@ + 20187479 BC-AFP+YX9:YX8* 7 0 1R 4:40 42485 42485 True Scores CFOOT Regular American National 7 0 4:40 1 Qtr January 18, 2014, at 06:37 PM ET diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -45,12 +45,18 @@ report_info, report_error ) import TSN.DbImport ( DbImport(..), ImportResult(..) ) -import qualified TSN.XML.Heartbeat as Heartbeat ( verify ) -import qualified TSN.XML.Injuries as Injuries ( pickle_message ) -import qualified TSN.XML.InjuriesDetail as InjuriesDetail ( pickle_message ) -import qualified TSN.XML.News as News ( pickle_message ) -import qualified TSN.XML.Odds as Odds ( pickle_message ) -import qualified TSN.XML.Weather as Weather ( pickle_message ) +import qualified TSN.XML.AutoRacingSchedule as AutoRacingSchedule ( + dtd, + pickle_message ) +import qualified TSN.XML.Heartbeat as Heartbeat ( dtd, verify ) +import qualified TSN.XML.Injuries as Injuries ( dtd, pickle_message ) +import qualified TSN.XML.InjuriesDetail as InjuriesDetail ( + dtd, + pickle_message ) +import qualified TSN.XML.News as News ( dtd, pickle_message ) +import qualified TSN.XML.Odds as Odds ( dtd, pickle_message ) +import qualified TSN.XML.Scores as Scores ( dtd, pickle_message ) +import qualified TSN.XML.Weather as Weather ( dtd, pickle_message ) import Xml ( DtdName(..), parse_opts ) @@ -136,7 +142,7 @@ import_with_dtd (DtdName dtd,xml) -- We special-case the heartbeat so it doesn't have to run in -- the database monad. - | dtd == "Heartbeat.dtd" = Heartbeat.verify xml + | dtd == Heartbeat.dtd = Heartbeat.verify xml | otherwise = -- We need NoMonomorphismRestriction here. if backend cfg == Postgres @@ -144,43 +150,51 @@ else withSqliteConn cs $ runDbConn importer where -- | Pull the real connection String out of the configuration. + -- cs :: String cs = get_connection_string $ connection_string cfg -- | Convenience; we use this everywhere below in 'importer'. + -- migrate_and_import m = dbmigrate m >> dbimport m importer - | dtd == "injuriesxml.dtd" = do + | dtd == AutoRacingSchedule.dtd = do + let m = unpickleDoc AutoRacingSchedule.pickle_message xml + maybe (return $ ImportFailed errmsg) migrate_and_import m + + | dtd == Injuries.dtd = do let m = unpickleDoc Injuries.pickle_message xml - let errmsg = "Could not unpickle injuriesxml." maybe (return $ ImportFailed errmsg) migrate_and_import m - | dtd == "Injuries_Detail_XML.dtd" = do + | dtd == InjuriesDetail.dtd = do let m = unpickleDoc InjuriesDetail.pickle_message xml - let errmsg = "Could not unpickle Injuries_Detail_XML." maybe (return $ ImportFailed errmsg) migrate_and_import m - | dtd == "newsxml.dtd" = do + | dtd == News.dtd = do let m = unpickleDoc News.pickle_message xml - let errmsg = "Could not unpickle newsxml." maybe (return $ ImportFailed errmsg) migrate_and_import m - | dtd == "Odds_XML.dtd" = do + | dtd == Odds.dtd = do let m = unpickleDoc Odds.pickle_message xml - let errmsg = "Could not unpickle Odds_XML." maybe (return $ ImportFailed errmsg) migrate_and_import m - | dtd == "weatherxml.dtd" = do + | dtd == Scores.dtd = do + let m = unpickleDoc Scores.pickle_message xml + maybe (return $ ImportFailed errmsg) migrate_and_import m + + | dtd == Weather.dtd = do let m = unpickleDoc Weather.pickle_message xml - let errmsg = "Could not unpickle weatherxml." maybe (return $ ImportFailed errmsg) migrate_and_import m | otherwise = do let infomsg = "Unrecognized DTD in " ++ path ++ ": " ++ dtd ++ "." return $ ImportUnsupported infomsg + + where + errmsg = "Could not unpickle " ++ dtd ++ "." -- | Entry point of the program. It twiddles some knobs for diff --git a/src/TSN/Picklers.hs b/src/TSN/Picklers.hs --- a/src/TSN/Picklers.hs +++ b/src/TSN/Picklers.hs @@ -4,6 +4,7 @@ module TSN.Picklers ( xp_date, xp_gamedate, + xp_tba_time, xp_time, xp_time_stamp ) where @@ -14,6 +15,7 @@ import System.Locale ( defaultTimeLocale ) import Text.XML.HXT.Arrow.Pickle ( xpText, + xpWrap, xpWrapMaybe ) import Text.XML.HXT.Arrow.Pickle.Xml ( PU ) @@ -99,6 +101,22 @@ from_time :: UTCTime -> String from_time = formatTime defaultTimeLocale xp_time_format + +-- | (Un)pickle a UTCTime without the date portion, allowing for a +-- value of \"TBA\" (which gets translated to 'Nothing'). +-- +xp_tba_time :: PU (Maybe UTCTime) +xp_tba_time = + (to_time, from_time) `xpWrap` xpText + where + to_time :: String -> Maybe UTCTime + to_time s + | s == "TBA" = Nothing + | otherwise = parseTime defaultTimeLocale xp_time_format s + + from_time :: Maybe UTCTime -> String + from_time Nothing = "" + from_time (Just t) = formatTime defaultTimeLocale xp_time_format t -- | (Un)pickle the \ element format to/from a 'UTCTime'. diff --git a/src/TSN/XML/AutoRacingSchedule.hs b/src/TSN/XML/AutoRacingSchedule.hs new file mode 100644 --- /dev/null +++ b/src/TSN/XML/AutoRacingSchedule.hs @@ -0,0 +1,565 @@ +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE GADTs #-} +{-# LANGUAGE QuasiQuotes #-} +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE StandaloneDeriving #-} +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE TypeFamilies #-} + +-- | Parse TSN XML for the DTD +-- \"Auto_Racing_Schedule_XML.dtd\". There's a top-level +-- \, containing \s, containing \, +-- containing \s. +-- +module TSN.XML.AutoRacingSchedule ( + dtd, + pickle_message, + -- * Tests + auto_racing_schedule_tests, + -- * WARNING: these are private but exported to silence warnings + AutoRacingScheduleConstructor(..), + AutoRacingScheduleListingConstructor(..), + AutoRacingScheduleListingRaceResultRaceResultListingConstructor(..) ) +where + +-- System imports. +import Control.Monad ( forM_ ) +import Data.Time ( UTCTime(..) ) +import Data.Tuple.Curry ( uncurryN ) +import Database.Groundhog ( + countAll, + executeRaw, + migrate, + runMigration, + silentMigrationLogger ) +import Database.Groundhog.Core ( DefaultKey ) +import Database.Groundhog.Generic ( runDbConn ) +import Database.Groundhog.Sqlite ( withSqliteConn ) +import Database.Groundhog.TH ( + groundhog, + mkPersist ) +import Test.Tasty ( TestTree, testGroup ) +import Test.Tasty.HUnit ( (@?=), testCase ) +import Text.XML.HXT.Core ( + PU, + xp7Tuple, + xp8Tuple, + xp10Tuple, + xpElem, + xpInt, + xpList, + xpOption, + xpText, + xpWrap ) + +-- Local imports. +import TSN.Codegen ( + tsn_codegen_config ) +import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) +import TSN.Picklers ( xp_date, xp_tba_time, xp_time_stamp ) +import TSN.XmlImport ( XmlImport(..), XmlImportFk(..) ) +import Xml ( + FromXml(..), + FromXmlFk(..), + ToDb(..), + pickle_unpickle, + unpickleable, + unsafe_unpickle ) + + +-- | The DTD to which this module corresponds. Used to invoke dbimport. +-- +dtd :: String +dtd = "Auto_Racing_Schedule_XML.dtd" + +-- +-- DB/XML data types +-- + +-- * AutoRacingSchedule/Message + +-- | Database representation of a 'Message'. +-- +data AutoRacingSchedule = + AutoRacingSchedule { + db_xml_file_id :: Int, + db_heading :: String, + db_category :: String, + db_sport :: String, + db_title :: String, + db_complete_through :: String, + db_time_stamp :: UTCTime } + deriving (Eq, Show) + + +-- | XML Representation of an 'AutoRacingSchedule'. +-- +data Message = + Message { + xml_xml_file_id :: Int, + xml_heading :: String, + xml_category :: String, + xml_sport :: String, + xml_title :: String, + xml_complete_through :: String, + xml_listings :: [AutoRacingScheduleListingXml], + xml_time_stamp :: UTCTime } + deriving (Eq, Show) + + +instance ToDb Message where + -- | The database analogue of a 'Message' is a 'AutoRacingSchedule'. + -- + type Db Message = AutoRacingSchedule + + +-- | The 'FromXml' instance for 'Message' is required for the +-- 'XmlImport' instance. +-- +instance FromXml Message where + -- | To convert a 'Message' to an 'AutoRacingSchedule', we just drop + -- the 'xml_listings'. + -- + from_xml Message{..} = + AutoRacingSchedule { + db_xml_file_id = xml_xml_file_id, + db_heading = xml_heading, + db_category = xml_category, + db_sport = xml_sport, + db_title = xml_title, + db_complete_through = xml_complete_through, + db_time_stamp = xml_time_stamp } + + +-- | This allows us to insert the XML representation 'Message' +-- directly. +-- +instance XmlImport Message + + +-- * AutoRacingScheduleListing/AutoRacingScheduleListingXml + +-- | Database representation of a \ contained within a +-- \. We combine the race date/time into a single +-- race_time, drop the race results list, and add a foreign key to +-- our parent. +-- +data AutoRacingScheduleListing = + AutoRacingScheduleListing { + db_auto_racing_schedules_id :: DefaultKey AutoRacingSchedule, + db_race_id :: Int, + db_race_time :: UTCTime, + db_race_name :: String, + db_track_name :: String, + db_location :: String, + db_tv_listing :: Maybe String, + db_laps :: Int, + db_track_length :: String -- ^ Sometimes the word "miles" shows up. + } + + +-- | XML representation of a \ contained within a +-- \. +-- +data AutoRacingScheduleListingXml = + AutoRacingScheduleListingXml { + xml_race_id :: Int, + xml_race_date :: UTCTime, + xml_race_time :: Maybe UTCTime, + xml_race_name :: String, + xml_track_name :: String, + xml_location :: String, + xml_tv_listing :: Maybe String, + xml_laps :: Int, + xml_track_length :: String, -- ^ Sometimes the word \"miles\" shows up, + -- so we can't do the right thing and use + -- a 'Double'. + xml_race_results :: [AutoRacingScheduleListingRaceResult] } + deriving (Eq, Show) + + +-- | Pseudo-accessor to get the race result listings out of a +-- 'AutoRacingScheduleListingXml'. A poor man's lens. +-- +result_listings :: AutoRacingScheduleListingXml + -> [AutoRacingScheduleListingRaceResultRaceResultListingXml] +result_listings = (concatMap xml_race_result_listing) . xml_race_results + + +instance ToDb AutoRacingScheduleListingXml where + -- | The database analogue of an 'AutoRacingScheduleListingXml' is + -- an 'AutoRacingScheduleListing'. + -- + type Db AutoRacingScheduleListingXml = AutoRacingScheduleListing + +instance FromXmlFk AutoRacingScheduleListingXml where + -- | Each 'AutoRacingScheduleListingXml' is contained in (i.e. has a + -- foreign key to) a 'AutoRacingSchedule'. + -- + type Parent AutoRacingScheduleListingXml = AutoRacingSchedule + + -- | To convert an 'AutoRacingScheduleListingXml' to an + -- 'AutoRacingScheduleListing', we add the foreign key and drop + -- the 'xml_race_results'. We also mash the date/time together + -- into one field. + -- + from_xml_fk fk AutoRacingScheduleListingXml{..} = + AutoRacingScheduleListing { + db_auto_racing_schedules_id = fk, + db_race_id = xml_race_id, + db_race_time = make_race_time xml_race_date xml_race_time, + db_race_name = xml_race_name, + db_track_name = xml_track_name, + db_location = xml_location, + db_tv_listing = xml_tv_listing, + db_laps = xml_laps, + db_track_length = xml_track_length } + where + -- | Make the database \"race time\" from the XML + -- date/time. Simply take the day part from one and the time + -- from the other. + -- + make_race_time d Nothing = d + make_race_time d (Just t) = UTCTime (utctDay d) (utctDayTime t) + + +-- | This allows us to insert the XML representation +-- 'AutoRacingScheduleListingXml' directly. +-- +instance XmlImportFk AutoRacingScheduleListingXml + + + +-- * AutoRacingScheduleListingRaceResult + +-- | The XML representation of \ -> \ -> +-- \. This element serves only to contain +-- \s, so we don't store the intermediate table +-- in the database. +-- +newtype AutoRacingScheduleListingRaceResult = + AutoRacingScheduleListingRaceResult { + xml_race_result_listing :: + [AutoRacingScheduleListingRaceResultRaceResultListingXml] } + deriving (Eq, Show) + + +-- * AutoRacingScheduleListingRaceResultRaceResultListing / +-- AutoRacingScheduleListingRaceResultRaceResultListingXml +-- +-- Sorry about the names yo. +-- + +-- | Database representation of \ within +-- \ within \ within... \! +-- +data AutoRacingScheduleListingRaceResultRaceResultListing = + AutoRacingScheduleListingRaceResultRaceResultListing { + db_auto_racing_schedules_listings_id :: + DefaultKey AutoRacingScheduleListing, + db_finish_position :: Int, + db_driver_id :: Int, + db_name :: String, + db_leading_laps :: Int, + db_listing_laps :: Int, -- ^ Avoid clash with race's \"laps\" field. + db_earnings :: String, -- ^ This should be an Int, but can have commas. + db_status :: String } + + +-- | XML Representation of an +-- 'AutoRacingScheduleListingRaceResultRaceResultListing'. +-- +data AutoRacingScheduleListingRaceResultRaceResultListingXml = + AutoRacingScheduleListingRaceResultRaceResultListingXml { + xml_finish_position :: Int, + xml_driver_id :: Int, + xml_name :: String, + xml_leading_laps :: Int, + xml_listing_laps :: Int, -- ^ Avoid clash with race's \"laps\" field. + xml_earnings :: String, -- ^ Should be an 'Int', but can have commas. + xml_status :: String } + deriving (Eq, Show) + + +instance ToDb AutoRacingScheduleListingRaceResultRaceResultListingXml where + -- | The database representation of an + -- 'AutoRacingScheduleListingRaceResultRaceResultListingXml' is an + -- 'AutoRacingScheduleListingRaceResultRaceResultListing'. + -- + type Db AutoRacingScheduleListingRaceResultRaceResultListingXml = + AutoRacingScheduleListingRaceResultRaceResultListing + + +instance FromXmlFk AutoRacingScheduleListingRaceResultRaceResultListingXml where + -- | Each 'AutoRacingScheduleListingRaceResultRaceResultListingXml' + -- is contained in (i.e. has a foreign key to) an + -- 'AutoRacingScheduleListing'. We skip the intermediate + -- \. + -- + type Parent AutoRacingScheduleListingRaceResultRaceResultListingXml = + AutoRacingScheduleListing + + -- | To convert an + -- 'AutoRacingScheduleListingRaceResultRaceResultListingXml' to an + -- 'AutoRacingScheduleListingRaceResultRaceResultListing', we just + -- add the foreign key to the parent 'AutoRacingScheduleListing'. + -- + from_xml_fk fk AutoRacingScheduleListingRaceResultRaceResultListingXml{..} = + AutoRacingScheduleListingRaceResultRaceResultListing { + db_auto_racing_schedules_listings_id = fk, + db_finish_position = xml_finish_position, + db_driver_id = xml_driver_id, + db_name = xml_name, + db_leading_laps = xml_leading_laps, + db_listing_laps = xml_listing_laps, + db_earnings = xml_earnings, + db_status = xml_earnings } + + +-- | This allows us to insert the XML representation +-- 'AutoRacingScheduleListingRaceResultRaceResultListingXml' +-- directly. +-- +instance XmlImportFk AutoRacingScheduleListingRaceResultRaceResultListingXml + + +--- +--- Database stuff. +--- + +instance DbImport Message where + dbmigrate _ = + run_dbmigrate $ do + migrate (undefined :: AutoRacingSchedule) + migrate (undefined :: AutoRacingScheduleListing) + migrate (undefined + :: AutoRacingScheduleListingRaceResultRaceResultListing) + + + -- | We insert the message, then use its ID to insert the listings, + -- using their IDs to insert the race result listings. + -- + dbimport m = do + msg_id <- insert_xml m + + forM_ (xml_listings m) $ \listing -> do + listing_id <- insert_xml_fk msg_id listing + + mapM_ (insert_xml_fk_ listing_id) (result_listings listing) + + return ImportSucceeded + + +mkPersist tsn_codegen_config [groundhog| +- entity: AutoRacingSchedule + dbName: auto_racing_schedules + constructors: + - name: AutoRacingSchedule + uniques: + - name: unique_auto_racing_schedule + type: constraint + # Prevent multiple imports of the same message. + fields: [db_xml_file_id] + +- entity: AutoRacingScheduleListing + dbName: auto_racing_schedules_listings + constructors: + - name: AutoRacingScheduleListing + fields: + - name: db_auto_racing_schedules_id + reference: + onDelete: cascade + +- entity: AutoRacingScheduleListingRaceResultRaceResultListing + dbName: auto_racing_schedules_listings_race_result_listings + constructors: + - name: AutoRacingScheduleListingRaceResultRaceResultListing + fields: + - name: db_auto_racing_schedules_listings_id + reference: + onDelete: cascade +|] + + + +--- +--- Pickling +--- + +-- | Pickler for the top-level 'Message'. +-- +pickle_message :: PU Message +pickle_message = + xpElem "message" $ + xpWrap (from_tuple, to_tuple) $ + xp8Tuple (xpElem "XML_File_ID" xpInt) + (xpElem "heading" xpText) + (xpElem "category" xpText) + (xpElem "sport" xpText) + (xpElem "Title" xpText) + (xpElem "Complete_Through" xpText) + (xpList pickle_listing) + (xpElem "time_stamp" xp_time_stamp) + where + from_tuple = uncurryN Message + to_tuple m = (xml_xml_file_id m, + xml_heading m, + xml_category m, + xml_sport m, + xml_title m, + xml_complete_through m, + xml_listings m, + xml_time_stamp m) + + +-- | Convert an 'AutoRacingScheduleListingXml' to/from XML. +-- +pickle_listing :: PU AutoRacingScheduleListingXml +pickle_listing = + xpElem "Listing" $ + xpWrap (from_tuple, to_tuple) $ + xp10Tuple (xpElem "RaceID" xpInt) + (xpElem "Race_Date" xp_date) + (xpElem "Race_Time" xp_tba_time) + (xpElem "RaceName" xpText) + (xpElem "TrackName" xpText) + (xpElem "Location" xpText) + (xpElem "TV_Listing" $ xpOption xpText) + (xpElem "Laps" xpInt) + (xpElem "TrackLength" xpText) + (xpList pickle_race_results) + where + from_tuple = uncurryN AutoRacingScheduleListingXml + to_tuple m = (xml_race_id m, + xml_race_date m, + xml_race_time m, + xml_race_name m, + xml_track_name m, + xml_location m, + xml_tv_listing m, + xml_laps m, + xml_track_length m, + xml_race_results m) + + +-- | Convert an 'AutoRacingScheduleListingRaceResult' to/from XML. +-- +pickle_race_results :: PU AutoRacingScheduleListingRaceResult +pickle_race_results = + xpElem "RaceResults" $ + xpWrap (to_result, from_result) $ + xpList pickle_race_results_listing + where + to_result = AutoRacingScheduleListingRaceResult + from_result = xml_race_result_listing + + +-- | Convert an +-- 'AutoRacingScheduleListingRaceResultRaceResultListingXml' to/from +-- XML. +-- +pickle_race_results_listing :: + PU AutoRacingScheduleListingRaceResultRaceResultListingXml +pickle_race_results_listing = + xpElem "RaceResultsListing" $ + xpWrap (from_tuple, to_tuple) $ + xp7Tuple (xpElem "FinishPosition" xpInt) + (xpElem "DriverID" xpInt) + (xpElem "Name" xpText) + (xpElem "LeadingLaps" xpInt) + (xpElem "Laps" xpInt) + (xpElem "Earnings" xpText) + (xpElem "Status" xpText) + where + from_tuple = + uncurryN AutoRacingScheduleListingRaceResultRaceResultListingXml + + to_tuple m = (xml_finish_position m, + xml_driver_id m, + xml_name m, + xml_leading_laps m, + xml_listing_laps m, + xml_earnings m, + xml_status m) + + +-- +-- Tasty Tests +-- + +-- | A list of all tests for this module. +-- +auto_racing_schedule_tests :: TestTree +auto_racing_schedule_tests = + testGroup + "AutoRacingSchedule tests" + [ test_on_delete_cascade, + test_pickle_of_unpickle_is_identity, + test_unpickle_succeeds ] + +-- | If we unpickle something and then pickle it, we should wind up +-- with the same thing we started with. WARNING: success of this +-- test does not mean that unpickling succeeded. +-- +test_pickle_of_unpickle_is_identity :: TestTree +test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" + [ check "pickle composed with unpickle is the identity" + "test/xml/Auto_Racing_Schedule_XML.xml", + + check "pickle composed with unpickle is the identity (miles track length)" + "test/xml/Auto_Racing_Schedule_XML-miles-track-length.xml" ] + where + check desc path = testCase desc $ do + (expected, actual) <- pickle_unpickle pickle_message path + actual @?= expected + + +-- | Make sure we can actually unpickle these things. +-- +test_unpickle_succeeds :: TestTree +test_unpickle_succeeds = testGroup "unpickle tests" + [ check "unpickling succeeds" + "test/xml/Auto_Racing_Schedule_XML.xml", + + check "unpickling succeeds (non-int team_id)" + "test/xml/Auto_Racing_Schedule_XML-miles-track-length.xml" ] + where + check desc path = testCase desc $ do + actual <- unpickleable path pickle_message + let expected = True + actual @?= expected + + +-- | Make sure everything gets deleted when we delete the top-level +-- record. +-- +test_on_delete_cascade :: TestTree +test_on_delete_cascade = testGroup "cascading delete tests" + [ check "deleting auto_racing_schedules deletes its children" + "test/xml/Auto_Racing_Schedule_XML.xml" , + + check ("deleting auto_racing_schedules deletes its children " ++ + "(miles track length)") + "test/xml/Auto_Racing_Schedule_XML-miles-track-length.xml" ] + where + check desc path = testCase desc $ do + sched <- unsafe_unpickle path pickle_message + let a = undefined :: AutoRacingSchedule + let b = undefined :: AutoRacingScheduleListing + let c = undefined :: AutoRacingScheduleListingRaceResultRaceResultListing + + actual <- withSqliteConn ":memory:" $ runDbConn $ do + runMigration silentMigrationLogger $ do + migrate a + migrate b + migrate c + _ <- dbimport sched + -- No idea how 'delete' works, so do this instead. + executeRaw False "DELETE FROM auto_racing_schedules;" [] + count_a <- countAll a + count_b <- countAll b + count_c <- countAll c + return $ sum [count_a, count_b, count_c] + let expected = 0 + actual @?= expected diff --git a/src/TSN/XML/Heartbeat.hs b/src/TSN/XML/Heartbeat.hs --- a/src/TSN/XML/Heartbeat.hs +++ b/src/TSN/XML/Heartbeat.hs @@ -3,6 +3,7 @@ -- | Handle documents defined by Heartbeat.dtd. -- module TSN.XML.Heartbeat ( + dtd, verify, -- * Tests heartbeat_tests ) @@ -26,6 +27,11 @@ import TSN.DbImport ( ImportResult(..) ) import Xml ( pickle_unpickle, unpickleable ) + +-- | The DTD to which this module corresponds. +-- +dtd :: String +dtd = "Heartbeat.dtd" -- | The data structure that holds the XML representation of a -- Heartbeat message. diff --git a/src/TSN/XML/Injuries.hs b/src/TSN/XML/Injuries.hs --- a/src/TSN/XML/Injuries.hs +++ b/src/TSN/XML/Injuries.hs @@ -17,6 +17,7 @@ -- time_stamp. -- module TSN.XML.Injuries ( + dtd, pickle_message, -- * Tests injuries_tests, @@ -71,6 +72,12 @@ unpickleable, unsafe_unpickle ) + + +-- | The DTD to which this module corresponds. Used to invoke dbimport. +-- +dtd :: String +dtd = "injuriesxml.dtd" -- -- DB/XML Data types diff --git a/src/TSN/XML/InjuriesDetail.hs b/src/TSN/XML/InjuriesDetail.hs --- a/src/TSN/XML/InjuriesDetail.hs +++ b/src/TSN/XML/InjuriesDetail.hs @@ -13,6 +13,7 @@ -- real meat. -- module TSN.XML.InjuriesDetail ( + dtd, pickle_message, -- * Tests injuries_detail_tests, @@ -65,6 +66,13 @@ pickle_unpickle, unpickleable, unsafe_unpickle ) + + + +-- | The DTD to which this module corresponds. Used to invoke dbimport. +-- +dtd :: String +dtd = "Injuries_Detail_XML.dtd" -- diff --git a/src/TSN/XML/News.hs b/src/TSN/XML/News.hs --- a/src/TSN/XML/News.hs +++ b/src/TSN/XML/News.hs @@ -11,6 +11,7 @@ -- a root element \ that contains an entire news item. -- module TSN.XML.News ( + dtd, pickle_message, -- * Tests news_tests, @@ -73,7 +74,13 @@ unsafe_unpickle ) +-- | The DTD to which this module corresponds. Used to invoke dbimport. -- +dtd :: String +dtd = "newsxml.dtd" + + +-- -- DB/XML Data types -- @@ -272,7 +279,6 @@ -- use our own codegen to peel those off before naming the columns. mkPersist tsn_codegen_config [groundhog| - entity: News - dbName: news constructors: - name: News uniques: diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs --- a/src/TSN/XML/Odds.hs +++ b/src/TSN/XML/Odds.hs @@ -12,6 +12,7 @@ -- other... disorganized... information. -- module TSN.XML.Odds ( + dtd, pickle_message, -- * Tests odds_tests, @@ -77,7 +78,13 @@ unsafe_unpickle ) +-- | The DTD to which this module corresponds. Used to invoke dbimport. -- +dtd :: String +dtd = "Odds_XML.dtd" + + +-- -- DB/XML data types -- @@ -793,12 +800,12 @@ -- test_on_delete_cascade :: TestTree test_on_delete_cascade = testGroup "cascading delete tests" - [ check "deleting odds deleted its children" + [ check "deleting odds deletes its children" "test/xml/Odds_XML.xml" 13 -- 5 casinos, 8 teams , - check "deleting odds deleted its children (non-int team_id)" + check "deleting odds deletes its children (non-int team_id)" "test/xml/Odds_XML-noninteger-team-id.xml" 51 -- 5 casinos, 46 teams , diff --git a/src/TSN/XML/Scores.hs b/src/TSN/XML/Scores.hs new file mode 100644 --- /dev/null +++ b/src/TSN/XML/Scores.hs @@ -0,0 +1,630 @@ +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE GADTs #-} +{-# LANGUAGE QuasiQuotes #-} +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE TypeFamilies #-} + +-- | Parse TSN XML for the DTD \"scoresxml.dtd\". Each document +-- contains a single \ and some \s. +-- +module TSN.XML.Scores ( + dtd, + pickle_message, + -- * Tests + scores_tests, + -- * WARNING: these are private but exported to silence warnings + Score_ScoreLocationConstructor(..), + ScoreConstructor(..), + ScoreGameConstructor(..), + ScoreGameTeamConstructor(..), + ScoreLocationConstructor(..), + ScoreGame_ScoreGameTeamConstructor(..) ) +where + +-- System imports. +import Data.Data ( Data ) +import Data.Time ( UTCTime ) +import Data.Tuple.Curry ( uncurryN ) +import Data.Typeable ( Typeable ) +import Database.Groundhog ( + countAll, + executeRaw, + insert, + insert_, + migrate, + runMigration, + silentMigrationLogger ) +import Database.Groundhog.Core ( DefaultKey ) +import Database.Groundhog.Generic ( runDbConn ) +import Database.Groundhog.Sqlite ( withSqliteConn ) +import Database.Groundhog.TH ( + defaultCodegenConfig, + groundhog, + mkPersist ) +import Test.Tasty ( TestTree, testGroup ) +import Test.Tasty.HUnit ( (@?=), testCase ) +import Text.XML.HXT.Core ( + PU, + xp7Tuple, + xp11Tuple, + xpAttr, + xpElem, + xpInt, + xpList, + xpOption, + xpPair, + xpPrim, + xpText, + xpTriple, + xpWrap ) + +-- Local imports. +import TSN.Codegen ( + tsn_codegen_config ) +import TSN.DbImport ( DbImport(..), ImportResult(..), run_dbmigrate ) +import TSN.Picklers ( xp_time_stamp ) +import TSN.XmlImport ( XmlImport(..), XmlImportFk(..) ) +import Xml ( + FromXml(..), + FromXmlFk(..), + ToDb(..), + pickle_unpickle, + unpickleable, + unsafe_unpickle ) + + +-- | The DTD to which this module corresponds. Used to invoke dbimport. +-- +dtd :: String +dtd = "scoresxml.dtd" + + +--- +--- DB/XML Data types +--- + + +-- * Score / Message + +-- | Database representation of a 'Message'. It lacks the +-- 'xml_locations' and 'xml_game' which are related via foreign keys +-- instead. +-- +data Score = + Score { + db_xml_file_id :: Int, + db_heading :: String, + db_game_id :: Int, + db_schedule_id :: Int, + db_tsnupdate :: Maybe Bool, + db_category :: String, + db_sport :: String, + db_season_type :: String, + db_time_stamp :: UTCTime } + + +-- | XML representation of the top level \ element (i.e. a +-- 'Score'). +-- +data Message = + Message { + xml_xml_file_id :: Int, + xml_heading :: String, + xml_game_id :: Int, + xml_schedule_id :: Int, + xml_tsnupdate :: Maybe Bool, + xml_category :: String, + xml_sport :: String, + xml_locations :: [ScoreLocation], + xml_season_type :: String, + xml_game :: ScoreGameXml, + xml_time_stamp :: UTCTime } + deriving (Eq, Show) + +instance ToDb Message where + -- | The database representation of a 'Message' is a 'Score'. + type Db Message = Score + +instance FromXml Message where + from_xml Message{..} = + Score { + db_xml_file_id = xml_xml_file_id, + db_heading = xml_heading, + db_game_id = xml_game_id, + db_schedule_id = xml_schedule_id, + db_tsnupdate = xml_tsnupdate, + db_category = xml_category, + db_sport = xml_sport, + db_season_type = xml_season_type, + db_time_stamp = xml_time_stamp } + + +-- | This lets us insert the XML representation 'Message' directly. +-- +instance XmlImport Message + + +-- * ScoreGame / ScoreGameXml + +-- | This is an embedded field within 'SportsGame'. Each \ +-- element has two attributes, a numeral and a type. It also +-- contains some text. Rather than put these in their own table, we +-- include them in the parent 'SportsGame'. +-- +data ScoreGameStatus = + ScoreGameStatus { + db_status_numeral :: Int, + db_status_type :: String, -- ^ These are probably only one-character long, + -- but they all take the same amount of space + -- in Postgres. + db_status_text :: String } + deriving (Data, Eq, Show, Typeable) + + +-- | Database representation of a game. +-- +data ScoreGame = + ScoreGame { + db_scores_id :: DefaultKey Score, + db_vscore :: Int, + db_hscore :: Int, + db_time_r :: Maybe String, -- ^ Time remaining, the format is uncertain. + db_status :: ScoreGameStatus, + db_notes :: Maybe String } + + +-- | XML representation of a \ element (i.e. a 'ScoreGame'). +-- +data ScoreGameXml = + ScoreGameXml { + xml_vteam :: ScoreGameVTeam, + xml_hteam :: ScoreGameHTeam, + xml_vscore :: Int, + xml_hscore :: Int, + xml_time_r :: Maybe String, -- ^ Time remaining, the format is uncertain. + xml_status :: ScoreGameStatus, + xml_notes :: Maybe String } + deriving (Eq, Show) + +-- | Pseudo-accessor to get the 'ScoreGameTeam' out of 'xml_vteam'. +vteam :: ScoreGameXml -> ScoreGameTeam +vteam g = let (ScoreGameVTeam t) = xml_vteam g in t + +-- | Pseudo-accessor to get the 'ScoreGameTeam' out of 'xml_hteam'. +hteam :: ScoreGameXml -> ScoreGameTeam +hteam g = let (ScoreGameHTeam t) = xml_hteam g in t + +instance ToDb ScoreGameXml where + -- | The database representation of a 'ScoreGameXml' is a + -- 'ScoreGame'. + -- + type Db ScoreGameXml = ScoreGame + +instance FromXmlFk ScoreGameXml where + -- | Each 'ScoreGameXml' is contained in (i.e. has a foreign key to) + -- a 'Score'. + -- + type Parent ScoreGameXml = Score + + from_xml_fk fk ScoreGameXml{..} = + ScoreGame { + db_scores_id = fk, + db_vscore = xml_vscore, + db_hscore = xml_hscore, + db_time_r = xml_time_r, + db_status = xml_status, + db_notes = xml_notes } + +-- | This lets us import the database representation 'ScoreGameXml' +-- directly. +-- +instance XmlImportFk ScoreGameXml + + +-- * ScoreGameTeam + +-- | A team that appears in a 'ScoreGame'. This is meant to represent +-- both home and away teams. +-- +data ScoreGameTeam = + ScoreGameTeam { + team_id :: String, + team_name :: String } + deriving (Eq, Show) + +-- | A wrapper around 'ScoreGameTeam' that lets us distinguish between +-- home and away teams. See also 'ScoreGameHTeam'. +-- +newtype ScoreGameVTeam = + ScoreGameVTeam ScoreGameTeam + deriving (Eq, Show) + + +-- | A wrapper around 'ScoreGameTeam' that lets us distinguish between +-- home and away teams. See also 'ScoreGameVTeam'. +-- +newtype ScoreGameHTeam = + ScoreGameHTeam ScoreGameTeam + deriving (Eq, Show) + + +-- * ScoreGame_ScoreGameTeam + +-- | Join a 'ScoreGame' with its home/away teams. Database-only. We +-- use a join table because the teams are kept unique. +-- +data ScoreGame_ScoreGameTeam = + ScoreGame_ScoreGameTeam + (DefaultKey ScoreGame) -- ^ game id + (DefaultKey ScoreGameTeam) -- ^ vteam id + (DefaultKey ScoreGameTeam) -- ^ hteam id + + +-- * ScoreLocation + +-- | Database and XML representation of a \. This is almost +-- identical to 'TSN.XML.NewsLocation', but the city/state have not +-- appeared optional here so far. +-- +data ScoreLocation = + ScoreLocation { + city :: String, + state :: String, + country :: String } + deriving (Eq, Show) + + +-- * Score_ScoreLocation + +-- | Join each 'Score' with its 'ScoreLocation's. Database-only. We +-- use a join table because the locations are kept unique. +-- +data Score_ScoreLocation = + Score_ScoreLocation + (DefaultKey Score) + (DefaultKey ScoreLocation) + + + +instance DbImport Message where + dbmigrate _ = + run_dbmigrate $ do + migrate (undefined :: Score) + migrate (undefined :: ScoreGame) + migrate (undefined :: ScoreGameTeam) + migrate (undefined :: ScoreGame_ScoreGameTeam) + migrate (undefined :: ScoreLocation) + migrate (undefined :: Score_ScoreLocation) + + dbimport m = do + -- Insert the message and get its ID. + msg_id <- insert_xml m + + -- Insert all of the locations contained within this message and + -- collect their IDs in a list. + location_ids <- mapM insert (xml_locations m) + + -- Now use that list to construct 'Score_ScoreLocation' objects, + -- and insert them. + mapM_ (insert_ . Score_ScoreLocation msg_id) location_ids + + -- Insert the game and its hteam/vteam, noting the IDs. + game_id <- insert_xml_fk msg_id (xml_game m) + vteam_id <- insert (vteam $ xml_game m) + hteam_id <- insert (hteam $ xml_game m) + + -- Finally add a 'ScoreGame_ScoreGameTeam' mapping the + -- aforementioned game to its hteam/vteam. + insert_ $ ScoreGame_ScoreGameTeam game_id vteam_id hteam_id + + return ImportSucceeded + + +-- These types don't have special XML representations or field name +-- collisions so we use the defaultCodegenConfig and give their +-- fields nice simple names. +mkPersist defaultCodegenConfig [groundhog| +- entity: ScoreGameTeam + dbName: scores_games_teams + constructors: + - name: ScoreGameTeam + uniques: + - name: unique_scores_games_team + type: constraint + fields: [team_id] + +- entity: ScoreLocation + dbName: scores_locations + constructors: + - name: ScoreLocation + uniques: + - name: unique_scores_location + type: constraint + fields: [city, state, country] + +|] + + + +-- These types have fields with e.g. db_ and xml_ prefixes, so we +-- use our own codegen to peel those off before naming the columns. +mkPersist tsn_codegen_config [groundhog| +- entity: Score + dbName: scores + constructors: + - name: Score + uniques: + - name: unique_scores + type: constraint + # Prevent multiple imports of the same message. + fields: [db_xml_file_id] + +- embedded: ScoreGameStatus + fields: + - name: db_status_numeral + dbName: status_numeral + - name: db_status_type + dbName: status_type + - name: db_status_text + dbName: status_text + +- entity: ScoreGame + dbName: scores_games + constructors: + - name: ScoreGame + fields: + - name: db_scores_id + reference: + onDelete: cascade + - name: db_status + embeddedType: + - { name: status_numeral, dbName: status_numeral } + - { name: status_type, dbName: status_type } + - { name: status_text, dbName: status_text } + +- entity: ScoreGame_ScoreGameTeam + dbName: scores_games__scores_games_teams + constructors: + - name: ScoreGame_ScoreGameTeam + fields: + - name: scoreGame_ScoreGameTeam0 # Default created by mkNormalFieldName + dbName: scores_games_id + reference: + onDelete: cascade + - name: scoreGame_ScoreGameTeam1 # Default created by mkNormalFieldName + dbName: scores_games_teams_vteam_id + reference: + onDelete: cascade + - name: scoreGame_ScoreGameTeam2 # Default created by mkNormalFieldName + dbName: scores_games_teams_hteam_id + reference: + onDelete: cascade + +- entity: Score_ScoreLocation + dbName: scores__scores_locations + constructors: + - name: Score_ScoreLocation + fields: + - name: score_ScoreLocation0 # Default created by mkNormalFieldName + dbName: scores_id + reference: + onDelete: cascade + - name: score_ScoreLocation1 # Default created by mkNormalFieldName + dbName: scores_locations_id + reference: + onDelete: cascade +|] + + +-- +-- Pickling +-- + +-- | Convert a 'Message' to/from \. +-- +pickle_message :: PU Message +pickle_message = + xpElem "message" $ + xpWrap (from_tuple, to_tuple) $ + xp11Tuple (xpElem "XML_File_ID" xpInt) + (xpElem "heading" xpText) + (xpElem "game_id" xpInt) + (xpElem "schedule_id" xpInt) + (xpOption $ xpElem "tsnupdate" xpPrim) + (xpElem "category" xpText) + (xpElem "sport" xpText) + (xpList pickle_location) + (xpElem "seasontype" xpText) + pickle_game + (xpElem "time_stamp" xp_time_stamp) + where + from_tuple = uncurryN Message + to_tuple m = (xml_xml_file_id m, + xml_heading m, + xml_game_id m, + xml_schedule_id m, + xml_tsnupdate m, + xml_category m, + xml_sport m, + xml_locations m, + xml_season_type m, + xml_game m, + xml_time_stamp m) + + + +-- | Convert a 'ScoreLocation' to/from \. +-- +pickle_location :: PU ScoreLocation +pickle_location = + xpElem "location" $ + xpWrap (from_tuple, to_tuple) $ + xpTriple (xpElem "city" xpText) + (xpElem "state" xpText) + (xpElem "country" xpText) + where + from_tuple = + uncurryN ScoreLocation + to_tuple l = (city l, state l, country l) + + +-- | Convert a 'ScoreGameStatus' to/from \. +-- +pickle_status :: PU ScoreGameStatus +pickle_status = + xpElem "status" $ + xpWrap (from_tuple, to_tuple) $ + xpTriple (xpAttr "numeral" xpInt) + (xpAttr "type" xpText) + xpText + where + from_tuple = uncurryN ScoreGameStatus + to_tuple ScoreGameStatus{..} = (db_status_numeral, + db_status_type, + db_status_text) + + +-- | Convert a 'ScoreGameXml' to/from \. +-- +pickle_game :: PU ScoreGameXml +pickle_game = + xpElem "game" $ + xpWrap (from_tuple, to_tuple) $ + xp7Tuple pickle_vteam + pickle_hteam + (xpElem "vscore" xpInt) + (xpElem "hscore" xpInt) + (xpOption $ xpElem "time_r" xpText) + pickle_status + (xpOption $ xpElem "notes" xpText) + where + from_tuple = uncurryN ScoreGameXml + to_tuple ScoreGameXml{..} = (xml_vteam, + xml_hteam, + xml_vscore, + xml_hscore, + xml_time_r, + xml_status, + xml_notes) + + +-- | Convert a 'ScoreGameVTeam' to/from \. +-- +pickle_vteam :: PU ScoreGameVTeam +pickle_vteam = + xpElem "vteam" $ + xpWrap (from_tuple, to_tuple) $ + xpPair (xpAttr "id" xpText) + xpText + where + from_tuple = ScoreGameVTeam . uncurry ScoreGameTeam + to_tuple (ScoreGameVTeam ScoreGameTeam{..}) = (team_id, team_name) + + +-- | Convert a 'ScoreGameVTeam' to/from \. Identical to +-- 'pickle_vteam' modulo the \"h\" and \"v\". +-- +pickle_hteam :: PU ScoreGameHTeam +pickle_hteam = + xpElem "hteam" $ + xpWrap (from_tuple, to_tuple) $ + xpPair (xpAttr "id" xpText) + xpText + where + from_tuple = ScoreGameHTeam . uncurry ScoreGameTeam + to_tuple (ScoreGameHTeam ScoreGameTeam{..}) = (team_id, team_name) + + + +--- +--- Tasty tests +--- + +-- | A list of all tests for this module. +-- +scores_tests :: TestTree +scores_tests = + testGroup + "Scores tests" + [ test_on_delete_cascade, + test_pickle_of_unpickle_is_identity, + test_unpickle_succeeds ] + + +-- | If we unpickle something and then pickle it, we should wind up +-- with the same thing we started with. WARNING: success of this +-- test does not mean that unpickling succeeded. +-- +test_pickle_of_unpickle_is_identity :: TestTree +test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" + [ check "pickle composed with unpickle is the identity" + "test/xml/scoresxml.xml", + + check "pickle composed with unpickle is the identity (no locations)" + "test/xml/scoresxml-no-locations.xml" ] + where + check desc path = testCase desc $ do + (expected, actual) <- pickle_unpickle pickle_message path + actual @?= expected + + +-- | Make sure we can actually unpickle these things. +-- +test_unpickle_succeeds :: TestTree +test_unpickle_succeeds = testGroup "unpickle tests" + [ check "unpickling succeeds" + "test/xml/scoresxml.xml", + + check "unpickling succeeds (no locations)" + "test/xml/scoresxml-no-locations.xml" ] + where + check desc path = testCase desc $ do + actual <- unpickleable path pickle_message + let expected = True + actual @?= expected + + +-- | Make sure everything gets deleted when we delete the top-level +-- record. +-- +test_on_delete_cascade :: TestTree +test_on_delete_cascade = testGroup "cascading delete tests" + [ check "unpickling succeeds" + "test/xml/scoresxml.xml" + 4, -- 2 teams, 2 locations + + check "unpickling succeeds (no locations)" + "test/xml/scoresxml-no-locations.xml" + 2 -- 2 teams, 0 locations + ] + where + check desc path expected = testCase desc $ do + score <- unsafe_unpickle path pickle_message + let a = undefined :: Score + let b = undefined :: ScoreGame + let c = undefined :: ScoreGameTeam + let d = undefined :: ScoreGame_ScoreGameTeam + let e = undefined :: ScoreLocation + let f = undefined :: Score_ScoreLocation + actual <- withSqliteConn ":memory:" $ runDbConn $ do + runMigration silentMigrationLogger $ do + migrate a + migrate b + migrate c + migrate d + migrate e + migrate f + _ <- dbimport score + -- No idea how 'delete' works, so do this instead. + executeRaw False "DELETE FROM scores;" [] + count_a <- countAll a + count_b <- countAll b + count_c <- countAll c + count_d <- countAll d + count_e <- countAll e + count_f <- countAll f + return $ sum [count_a, count_b, count_c, + count_d, count_e, count_f ] + actual @?= expected diff --git a/src/TSN/XML/Weather.hs b/src/TSN/XML/Weather.hs --- a/src/TSN/XML/Weather.hs +++ b/src/TSN/XML/Weather.hs @@ -10,6 +10,7 @@ -- that league contains a bunch of listings. -- module TSN.XML.Weather ( + dtd, pickle_message, -- * Tests weather_tests, @@ -62,6 +63,13 @@ pickle_unpickle, unpickleable, unsafe_unpickle ) + + + +-- | The DTD to which this module corresponds. Used to invoke dbimport. +-- +dtd :: String +dtd = "weatherxml.dtd" -- diff --git a/test/TestSuite.hs b/test/TestSuite.hs --- a/test/TestSuite.hs +++ b/test/TestSuite.hs @@ -1,20 +1,24 @@ import Test.Tasty ( TestTree, defaultMain, testGroup ) +import TSN.XML.AutoRacingSchedule ( auto_racing_schedule_tests ) import TSN.XML.Heartbeat ( heartbeat_tests ) import TSN.XML.Injuries ( injuries_tests ) import TSN.XML.InjuriesDetail ( injuries_detail_tests ) import TSN.XML.News ( news_tests ) import TSN.XML.Odds ( odds_tests ) +import TSN.XML.Scores ( scores_tests ) import TSN.XML.Weather ( weather_tests ) tests :: TestTree tests = testGroup "All tests" - [ heartbeat_tests, + [ auto_racing_schedule_tests, + heartbeat_tests, injuries_tests, injuries_detail_tests, news_tests, odds_tests, + scores_tests, weather_tests ] main :: IO () diff --git a/test/shell/import-duplicates.test b/test/shell/import-duplicates.test --- a/test/shell/import-duplicates.test +++ b/test/shell/import-duplicates.test @@ -15,15 +15,15 @@ # Heartbeat.xml that doesn't really count. find ./test/xml -name '*.xml' | wc -l >>> -12 +16 >>>= 0 # Run the imports again; we should get complaints about the duplicate -# xml_file_ids. There are 2 errors for each violation, so we expect 2*11 +# xml_file_ids. There are 2 errors for each violation, so we expect 2*15 # occurrences of the string 'ERROR'. ./dist/build/htsn-import/htsn-import -c 'shelltest.sqlite3' test/xml/*.xml 2>&1 | grep ERROR | wc -l >>> -22 +30 >>>= 0 # Finally, clean up after ourselves. diff --git a/test/xml/Auto_Racing_Schedule_XML-miles-track-length.xml b/test/xml/Auto_Racing_Schedule_XML-miles-track-length.xml new file mode 100644 --- /dev/null +++ b/test/xml/Auto_Racing_Schedule_XML-miles-track-length.xml @@ -0,0 +1,1 @@ + 20136765 ATX%SCHEDULE Statistics NASCAR-T 2014 Camping World Series Schedule Complete through 1739 02/21/2014 07:30 PM NextEra Energy Resources 250 Daytona International Speedway Daytona Beach, FL FS1 100 2.5 1740 03/29/2014 01:30 PM Kroger 250 Martinsville Speedway Martinsville, VA FS1 250 0.526 1741 05/09/2014 02:00 PM SFP 250 Kansas Speedway Kansas City, KS FS1 167 1.5 1742 05/16/2014 08:00 PM North Carolina Education Lottery 200 Charlotte Motor Speedway Concord, NC FS1 134 1.5 1743 05/30/2014 05:00 PM Lucas Oil 200 Dover International Speedway Dover, DE FS1 200 1.0 1744 06/06/2014 09:00 PM WinStar World Casino 400 Texas Motor Speedway Fort Worth, TX FS1 167 1.5 1759 06/14/2014 09:00 PM Gateway 200 Gateway Motorsports Park Madison, IL FS1 160 1.25 miles 1745 06/26/2014 08:00 PM UNOH 225 Kentucky Speedway Sparta, KY FS1 150 1.5 1746 07/11/2014 08:30 PM American Ethanol 200 Iowa Speedway Newton, IA FS1 200 0.875 1747 07/23/2014 09:35 PM Mudsummer Classic Eldora Speedway Rossburg, OH FS1 153 0.5 1748 08/02/2014 01:00 PM Pocono Mountains 125 Pocono Raceway Long Pond, PA FS1 54 2.5 1749 08/16/2014 12:30 PM Michigan National Guard 200 Michigan International Speedway Brooklyn, MI FS1 100 2.0 1750 08/20/2014 08:00 PM UNOH 200 Bristol Motor Speedway Bristol, TN FS1 200 0.533 1751 08/31/2014 02:00 PM Chevrolet Silverado 250 Canadian Tire Motorsport Park Bowmanville, ON, Canada FS1 64 2.459 1752 09/12/2014 08:30 PM EnjoyIllinois.com 225 Chicagoland Speedway Joliet, IL FS1 150 1.5 1760 09/20/2014 03:00 PM Camping World Truck Series 200 New Hampshire Motor Speedway Loudon, NH FS1 175 1.058 1753 09/27/2014 08:30 PM Smith's 350 Las Vegas Motor Speedway Las Vegas, NV FS1 146 1.5 1754 10/18/2014 04:00 PM Fred's 250 Talladega Superspeedway Talladega, AL FS1 94 2.66 1755 10/25/2014 01:30 PM Kroger 200 Martinsville Speedway Martinsville, VA FS1 200 0.526 1756 10/31/2014 08:30 PM WinStar World Casino 350 Texas Motor Speedway Fort Worth, TX FS1 147 1.5 1757 11/07/2014 08:00 PM Lucas Oil 150 Phoenix International Raceway Avondale, AZ FS1 150 1.0 1758 11/14/2014 08:00 PM Ford EcoBoost 200 Homestead-Miami Speedway Homestead, FL FS1 148 1.5 January 13, 2014, at 12:04 PM ET diff --git a/test/xml/Auto_Racing_Schedule_XML.dtd b/test/xml/Auto_Racing_Schedule_XML.dtd new file mode 100644 --- /dev/null +++ b/test/xml/Auto_Racing_Schedule_XML.dtd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/xml/Auto_Racing_Schedule_XML.xml b/test/xml/Auto_Racing_Schedule_XML.xml new file mode 100644 --- /dev/null +++ b/test/xml/Auto_Racing_Schedule_XML.xml @@ -0,0 +1,1 @@ + 20136714 BFX%SCHEDULE Statistics NASCAR 2013 NASCAR Sprint Cup Schedule Complete through 1492 02/16/2013 08:10 PM Sprint Unlimited at Daytona Daytona International Speedway Daytona Beach, FL FOX 75 2.5 1 25 Kevin Harvick 40 75 205,075 Running 2 49 Greg Biffle 2 75 101,325 Running 3 1306 Joey Logano 0 75 61,325 Running 4 43 Tony Stewart 5 75 52,325 Running 5 28 Matt Kenseth 26 75 51,300 Running 1493 02/21/2013 02:00 PM Budweiser Duel 1 Daytona International Speedway Daytona Beach, FL SPEED 60 2.5 1 25 Kevin Harvick 23 60 57,792 Running 2 49 Greg Biffle 0 60 42,789 Running 3 59 Juan Pablo Montoya 0 60 37,789 Running 4 27 Jimmie Johnson 0 60 23,789 Running 5 18 Kurt Busch 0 60 30,789 Running 1494 02/21/2013 04:00 PM Budweiser Duel 2 Daytona International Speedway Daytona Beach, FL SPEED 60 2.5 1 304 Kyle Busch 19 60 58,977 Running 2 109 Kasey Kahne 0 60 43,963 Running 3 1321 Austin Dillon 0 60 38,963 Running 4 431 Clint Bowyer 1 60 33,963 Running 5 28 Matt Kenseth 0 60 31,963 Running 1495 02/24/2013 01:00 PM Daytona 500 Daytona International Speedway Daytona Beach, FL FOX 200 2.5 1 27 Jimmie Johnson 17 200 1,525,275 Running 2 20 Dale Earnhardt Jr. 0 200 1,104,814 Running 3 32 Mark Martin 0 200 817,013 Running 4 433 Brad Keselowski 13 200 707,855 Running 5 47 Ryan Newman 3 200 578,471 Running 1496 03/03/2013 03:00 PM Subway Fresh Fit 500 Phoenix International Raceway Avondale, AZ FOX 316 1.0 1 127 Carl Edwards 122 316 298,875 Running 2 27 Jimmie Johnson 1 316 209,686 Running 3 490 Denny Hamlin 0 316 157,575 Running 4 433 Brad Keselowski 16 316 168,076 Running 5 20 Dale Earnhardt Jr. 47 316 130,750 Running 1497 03/10/2013 03:00 PM Kobalt Tools 400 Las Vegas Motor Speedway Las Vegas, NV FOX 267 1.5 1 28 Matt Kenseth 42 267 408,666 Running 2 109 Kasey Kahne 114 267 284,340 Running 3 433 Brad Keselowski 12 267 248,956 Running 4 304 Kyle Busch 27 267 208,698 Running 5 127 Carl Edwards 0 267 180,590 Running 1498 03/17/2013 01:00 PM Food City 500 Bristol Motor Speedway Bristol, TN FOX 500 0.533 1 109 Kasey Kahne 109 500 176,760 Running 2 304 Kyle Busch 56 500 188,893 Running 3 433 Brad Keselowski 62 500 168,651 Running 4 18 Kurt Busch 1 500 134,255 Running 5 431 Clint Bowyer 0 500 144,543 Running 1499 03/24/2013 03:00 PM Auto Club 400 Auto Club Speedway Fontana, CA FOX 200 2.0 1 304 Kyle Busch 125 200 334,233 Running 2 20 Dale Earnhardt Jr. 0 200 212,340 Running 3 1306 Joey Logano 41 200 193,673 Running 4 127 Carl Edwards 0 200 181,815 Running 5 18 Kurt Busch 0 200 146,585 Running 1500 04/07/2013 01:00 PM STP Gas Booster 500 Martinsville Speedway Martinsville, VA FOX 500 0.526 1 27 Jimmie Johnson 346 500 214,471 Running 2 431 Clint Bowyer 0 500 164,893 Running 3 22 Jeff Gordon 0 500 146,446 Running 4 109 Kasey Kahne 0 500 112,385 Running 5 304 Kyle Busch 56 500 145,278 Running 1501 04/13/2013 07:30 PM NRA 500 Texas Motor Speedway Fort Worth, TX FOX 334 1.5 1 304 Kyle Busch 171 334 550,858 Running 2 266 Martin Truex Jr. 142 334 346,555 Running 3 127 Carl Edwards 0 334 268,605 Running 4 49 Greg Biffle 0 334 214,855 Running 5 1306 Joey Logano 1 334 209,913 Running 1502 04/21/2013 01:00 PM STP 400 Kansas Speedway Kansas City, KS FOX 267 1.5 1 28 Matt Kenseth 163 267 263,816 Running 2 109 Kasey Kahne 0 267 182,085 Running 3 27 Jimmie Johnson 9 267 185,021 Running 4 266 Martin Truex Jr. 46 267 155,985 Running 5 431 Clint Bowyer 0 267 156,218 Running 1503 04/27/2013 07:30 PM Toyota Owners 400 Richmond International Raceway Richmond, VA FOX 406 0.75 1 25 Kevin Harvick 3 406 242,511 Running 2 431 Clint Bowyer 113 406 196,668 Running 3 1306 Joey Logano 0 406 161,618 Running 4 59 Juan Pablo Montoya 67 406 147,474 Running 5 16 Jeff Burton 7 406 118,435 Running 1504 05/05/2013 01:00 PM Aaron's 499 Talladega Superspeedway Talladega, AL FOX 192 2.66 1 455 David Ragan 4 192 373,108 Running 2 399 David Gilliland 0 192 235,153 Running 3 127 Carl Edwards 5 192 207,720 Running 4 46 Michael Waltrip 0 192 155,620 Running 5 27 Jimmie Johnson 16 192 181,426 Running 1505 05/11/2013 07:00 PM Bojangles Southern 500 Darlington Raceway Darlington, SC FOX 367 1.366 1 28 Matt Kenseth 17 367 314,866 Running 2 490 Denny Hamlin 0 367 211,465 Running 3 22 Jeff Gordon 16 367 200,026 Running 4 27 Jimmie Johnson 0 367 178,876 Running 5 25 Kevin Harvick 0 367 165,976 Running 1506 05/18/2013 07:30 PM Sprint Showdown Charlotte Motor Speedway Concord, NC SPEED 40 1.5 1 34 Jamie McMurray 40 40 50,915 Running 2 1341 Ricky Stenhouse Jr. 0 40 40,915 Running 3 16 Jeff Burton 0 40 36,640 Running 4 310 Paul Menard 0 40 34,540 Running 5 266 Martin Truex Jr. 0 40 33,540 Running 1507 05/18/2013 09:00 PM NASCAR Sprint All-Star Race Charlotte Motor Speedway Concord, NC SPEED 90 1.5 1 27 Jimmie Johnson 10 90 1,039,175 Running 2 1306 Joey Logano 0 90 244,175 Running 3 304 Kyle Busch 29 90 144,175 Running 4 109 Kasey Kahne 11 90 114,150 Running 5 18 Kurt Busch 29 90 109,150 Running 1508 05/26/2013 06:00 PM Coca-Cola 600 Charlotte Motor Speedway Concord, NC FOX 400 1.5 1 25 Kevin Harvick 28 400 407,011 Running 2 109 Kasey Kahne 161 400 291,615 Running 3 18 Kurt Busch 8 400 218,560 Running 4 490 Denny Hamlin 6 400 220,915 Running 5 1306 Joey Logano 0 400 174,823 Running 1509 06/02/2013 01:00 PM FedEx 400 Dover International Speedway Dover, DE FOX 400 1.0 1 43 Tony Stewart 139 400 318,100 Running 2 59 Juan Pablo Montoya 19 400 226,504 Running 3 22 Jeff Gordon 0 400 203,051 Running 4 304 Kyle Busch 150 400 196,198 Running 5 433 Brad Keselowski 2 400 177,431 Running 1510 06/09/2013 01:00 PM Party in the Poconos 400 Pocono Raceway Long Pond, PA TNT 160 2.5 1 27 Jimmie Johnson 128 160 244,436 Running 2 49 Greg Biffle 0 160 179,185 Running 3 20 Dale Earnhardt Jr. 0 160 143,060 Running 4 43 Tony Stewart 0 160 165,810 Running 5 47 Ryan Newman 19 160 144,343 Running 1511 06/16/2013 01:00 PM Quicken Loans 400 Michigan International Speedway Brooklyn, MI TNT 200 2.0 1 49 Greg Biffle 48 200 240,460 Running 2 25 Kevin Harvick 0 200 173,781 Running 3 266 Martin Truex Jr. 0 200 145,670 Running 4 304 Kyle Busch 0 200 148,803 Running 5 43 Tony Stewart 0 200 142,085 Running 1513 06/23/2013 03:00 PM Toyota/Save Mart 350 Sonoma Raceway Sonoma, CA TNT 110 1.99 1 266 Martin Truex Jr. 51 110 309,250 Running 2 22 Jeff Gordon 4 110 240,451 Running 3 127 Carl Edwards 0 110 198,140 Running 4 18 Kurt Busch 15 110 154,860 Running 5 431 Clint Bowyer 0 110 157,548 Running 1514 06/30/2013 12:00 PM Quaker State 400 Kentucky Speedway Sparta, KY TNT 267 1.5 1 28 Matt Kenseth 38 267 200,451 Running 2 34 Jamie McMurray 0 267 159,115 Running 3 431 Clint Bowyer 0 267 146,078 Running 4 1306 Joey Logano 0 267 130,338 Running 5 304 Kyle Busch 0 267 139,743 Running 1515 07/06/2013 07:30 PM Coke Zero 400 Daytona International Speedway Daytona Beach, FL TNT 161 2.5 1 27 Jimmie Johnson 94 161 327,961 Running 2 43 Tony Stewart 0 161 254,490 Running 3 25 Kevin Harvick 0 161 224,301 Running 4 431 Clint Bowyer 0 161 182,073 Running 5 46 Michael Waltrip 0 161 141,365 Running 1516 07/14/2013 01:00 PM Camping World RV Sales 301 New Hampshire Motor Speedway Loudon, NH TNT 302 1.058 1 118 Brian Vickers 16 302 214,075 Running 2 304 Kyle Busch 53 302 228,043 Running 3 16 Jeff Burton 0 302 147,135 Running 4 433 Brad Keselowski 14 302 179,076 Running 5 580 Aric Almirola 0 302 152,496 Running 1517 07/28/2013 01:00 PM Crown Royal 400 at the Brickyard Indianapolis Motor Speedway Indianapolis, IN ESPN 160 2.5 1 47 Ryan Newman 45 160 423,033 Running 2 27 Jimmie Johnson 73 160 379,736 Running 3 109 Kasey Kahne 0 160 299,500 Running 4 43 Tony Stewart 0 160 300,650 Running 5 28 Matt Kenseth 0 160 273,266 Running 1518 08/04/2013 01:00 PM GoBowling.com 400 Pocono Raceway Long Pond, PA ESPN 160 2.5 1 109 Kasey Kahne 66 160 208,500 Running 2 22 Jeff Gordon 7 160 199,221 Running 3 18 Kurt Busch 9 160 153,930 Running 4 47 Ryan Newman 2 160 161,343 Running 5 20 Dale Earnhardt Jr. 2 160 130,585 Running 1519 08/11/2013 01:00 PM Cheez-It 355 at the Glen Watkins Glen International Watkins Glen, NY ESPN 90 2.45 1 304 Kyle Busch 29 90 236,658 Running 2 433 Brad Keselowski 0 90 204,876 Running 3 266 Martin Truex Jr. 0 90 161,735 Running 4 127 Carl Edwards 0 90 149,360 Running 5 59 Juan Pablo Montoya 1 90 137,524 Running 1520 08/18/2013 01:00 PM Pure Michigan 400 Michigan International Speedway Brooklyn, MI ESPN 200 2.0 1 1306 Joey Logano 51 200 252,393 Running 2 25 Kevin Harvick 0 200 180,731 Running 3 18 Kurt Busch 43 200 136,315 Running 4 310 Paul Menard 0 200 143,486 Running 5 431 Clint Bowyer 0 200 145,493 Running 1521 08/24/2013 07:30 PM IRWIN Tools Night Race Bristol Motor Speedway Bristol, TN ABC 500 0.533 1 28 Matt Kenseth 149 500 328,466 Running 2 109 Kasey Kahne 0 500 214,815 Running 3 59 Juan Pablo Montoya 0 500 200,529 Running 4 118 Brian Vickers 0 500 150,315 Running 5 1306 Joey Logano 0 500 155,973 Running 1522 09/01/2013 07:30 PM AdvoCare 500 Atlanta Motor Speedway Hampton, GA ESPN 325 1.54 1 304 Kyle Busch 36 325 338,058 Running 2 1306 Joey Logano 78 325 244,473 Running 3 266 Martin Truex Jr. 0 325 207,065 Running 4 18 Kurt Busch 0 325 165,235 Running 5 47 Ryan Newman 3 325 167,848 Running 1523 09/07/2013 07:30 PM Federated Auto Parts 400 Richmond International Raceway Richmond, VA ABC 400 0.75 1 127 Carl Edwards 46 400 286,475 Running 2 18 Kurt Busch 73 400 185,355 Running 3 47 Ryan Newman 4 400 181,443 Running 4 34 Jamie McMurray 6 400 151,805 Running 5 310 Paul Menard 3 400 140,701 Running 1524 09/15/2013 02:00 PM GEICO 400 Chicagoland Speedway Joliet, IL ESPN 267 1.5 1 28 Matt Kenseth 89 267 334,891 Running 2 304 Kyle Busch 67 267 261,048 Running 3 25 Kevin Harvick 2 267 221,326 Running 4 18 Kurt Busch 0 267 169,960 Running 5 27 Jimmie Johnson 40 267 176,926 Running 1525 09/22/2013 02:00 PM Sylvania 300 New Hampshire Motor Speedway Loudon, NH ESPN 300 1.058 1 28 Matt Kenseth 106 300 262,066 Running 2 304 Kyle Busch 0 300 210,143 Running 3 49 Greg Biffle 0 300 151,785 Running 4 27 Jimmie Johnson 1 300 160,796 Running 5 34 Jamie McMurray 0 300 142,005 Running 1526 09/29/2013 02:00 PM AAA 400 Dover International Speedway Dover, DE ESPN 400 1.0 1 27 Jimmie Johnson 243 400 243,836 Running 2 20 Dale Earnhardt Jr. 80 400 197,210 Running 3 1306 Joey Logano 0 400 166,068 Running 4 22 Jeff Gordon 3 400 168,296 Running 5 304 Kyle Busch 30 400 162,068 Running 1527 10/06/2013 02:00 PM Hollywood Casino 400 Kansas Speedway Kansas City, KS ESPN 267 1.5 1 25 Kevin Harvick 138 267 364,636 Running 2 18 Kurt Busch 0 267 229,810 Running 3 22 Jeff Gordon 0 267 216,776 Running 4 1306 Joey Logano 33 267 176,473 Running 5 127 Carl Edwards 0 267 169,965 Running 1528 10/12/2013 07:30 PM Bank of America 500 Charlotte Motor Speedway Concord, NC ABC 334 1.5 1 433 Brad Keselowski 11 334 314,441 Running 2 109 Kasey Kahne 138 334 224,810 Running 3 28 Matt Kenseth 1 334 199,426 Running 4 27 Jimmie Johnson 130 334 192,721 Running 5 304 Kyle Busch 4 334 163,568 Running 1529 10/20/2013 02:00 PM Camping World RV Sales 500 Talladega Superspeedway Talladega, AL ESPN 188 2.66 1 34 Jamie McMurray 16 188 236,345 Running 2 20 Dale Earnhardt Jr. 38 188 185,410 Running 3 1341 Ricky Stenhouse Jr. 6 188 187,596 Running 4 310 Paul Menard 0 188 154,726 Running 5 304 Kyle Busch 9 188 162,068 Running 1530 10/27/2013 02:00 PM Goody's Headache Relief Shot 500 Martinsville Speedway Ridgeway, VA ESPN 500 0.526 1 22 Jeff Gordon 78 500 188,796 Running 2 28 Matt Kenseth 202 500 177,736 Running 3 431 Clint Bowyer 60 500 141,478 Running 4 433 Brad Keselowski 0 500 153,436 Running 5 27 Jimmie Johnson 123 500 144,046 Running 1531 11/03/2013 03:00 PM AAA Texas 500 Texas Motor Speedway Fort Worth, TX ESPN 334 1.5 1 27 Jimmie Johnson 255 334 484,211 Running 2 20 Dale Earnhardt Jr. 0 334 337,810 Running 3 1306 Joey Logano 1 334 256,393 Running 4 28 Matt Kenseth 3 334 238,776 Running 5 109 Kasey Kahne 0 334 180,585 Running 1532 11/10/2013 03:00 PM AdvoCare 500 Phoenix International Raceway Avondale, AZ ESPN 312 1.0 1 25 Kevin Harvick 70 312 263,386 Running 2 109 Kasey Kahne 41 312 171,715 Running 3 27 Jimmie Johnson 1 312 182,326 Running 4 20 Dale Earnhardt Jr. 2 312 131,135 Running 5 18 Kurt Busch 0 312 137,630 Running 1533 11/17/2013 03:00 PM Ford EcoBoost 400 Homestead-Miami Speedway Homestead, FL ESPN 267 1.5 1 490 Denny Hamlin 72 267 322,350 Running 2 28 Matt Kenseth 144 267 293,251 Running 3 20 Dale Earnhardt Jr. 28 267 203,860 Running 4 266 Martin Truex Jr. 0 267 179,435 Running 5 431 Clint Bowyer 0 267 167,968 Running January 13, 2014, at 11:34 AM ET diff --git a/test/xml/scoresxml-no-locations.xml b/test/xml/scoresxml-no-locations.xml new file mode 100644 --- /dev/null +++ b/test/xml/scoresxml-no-locations.xml @@ -0,0 +1,1 @@ + 20160285 BC-BLP+P26:P56* 7 7 1R14:56 50719 50719 Scores CBASK-W Regular Campbell Gardner-Webb 7 7 14:56 1 Half January 16, 2014, at 11:17 AM ET diff --git a/test/xml/scoresxml.dtd b/test/xml/scoresxml.dtd new file mode 100644 --- /dev/null +++ b/test/xml/scoresxml.dtd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/xml/scoresxml.xml b/test/xml/scoresxml.xml new file mode 100644 --- /dev/null +++ b/test/xml/scoresxml.xml @@ -0,0 +1,1 @@ + 20160114 BC-ADi+129:143* 0 0 0 18166 18166 Scores NHL Montreal QUEBEC CANADA Ottawa ONTARIO CANADA Regular Montreal Ottawa 0 0 0 Period Ottawa - Right Wing Chris Neil (1/16, lower body) is probable for Thursday's game against Montreal. January 16, 2014, at 10:39 AM ET