Add GameInfo support for Matchup_NBA_NHL_XML.dtd.

diff --git a/doc/man1/htsn-import.1 b/doc/man1/htsn-import.1
index 2c6fdbb4bd12971779d30d8ad754b330338f8345..1bf75ff1ab8aa44bb03bb5a00bf7aa5b0bbf880a 100644 (file)
--- a/doc/man1/htsn-import.1
+++ b/doc/man1/htsn-import.1
@@ -61,6 +61,8 @@ Heartbeat.dtd
 Injuries_Detail_XML.dtd
 .IP \[bu]
 injuriesxml.dtd
+.IP \[bu] 2
+Matchup_NBA_NHL_XML.dtd (GameInfo)
 .IP \[bu]
 MLB_Gaming_Matchup_XML.dtd (GameInfo)
 .IP \[bu]

diff --git a/schema/Matchup_NBA_NHL_XML.dtd b/schema/Matchup_NBA_NHL_XML.dtd
new file mode 100644 (file)
index 0000000..3e243ec
--- /dev/null
+++ b/schema/Matchup_NBA_NHL_XML.dtd
@@ -0,0 +1,42 @@
+<!ELEMENT message  (XML_File_ID, heading , category , sport , Title , Matchup_Info , Head_To_Head_Record+ , Home_Record , Away_Record , Current_Streak? , Division_Conference_Records , Meetings+ , Matchup_Notes , Last_Five+ , time_stamp )>\r
+\r
+<!ELEMENT XML_File_ID  (#PCDATA )>\r
+\r
+<!ELEMENT heading  (#PCDATA )>\r
+\r
+<!ELEMENT category  (#PCDATA )>\r
+\r
+<!ELEMENT sport  (#PCDATA )>\r
+\r
+<!ELEMENT Title  (#PCDATA )>\r
+\r
+<!ELEMENT Matchup_Info  (#PCDATA )>\r
+\r
+<!ELEMENT Head_To_Head_Record  (Record+ )>\r
+\r
+<!ELEMENT Record  (#PCDATA )>\r
+<!ATTLIST Record  type CDATA  #REQUIRED >\r
+<!ELEMENT Home_Record  (#PCDATA )>\r
+\r
+<!ELEMENT Away_Record  (#PCDATA )>\r
+\r
+<!ELEMENT Current_Streak  (#PCDATA )>\r
+\r
+<!ELEMENT Division_Conference_Records  (Record_Vs+ )>\r
+\r
+<!ELEMENT Record_Vs  (#PCDATA )>\r
+<!ATTLIST Record_Vs  Record_Type CDATA  #REQUIRED >\r
+<!ELEMENT Meetings  (Game+ )>\r
+<!ATTLIST Meetings  Season CDATA  #REQUIRED >\r
+<!ELEMENT Game  (#PCDATA )>\r
+\r
+<!ELEMENT Matchup_Notes  (Note+ )>\r
+\r
+<!ELEMENT Note  (#PCDATA )>\r
+\r
+<!ELEMENT Last_Five  (LF_Game+ )>\r
+<!ATTLIST Last_Five  team CDATA  #REQUIRED >\r
+<!ELEMENT LF_Game  (#PCDATA )>\r
+\r
+<!ELEMENT time_stamp  (#PCDATA )>\r
+\r

diff --git a/schemagen/Matchup_NBA_NHL_XML/Matchup_NBA_NHL_XML.xml b/schemagen/Matchup_NBA_NHL_XML/Matchup_NBA_NHL_XML.xml
new file mode 100644 (file)
index 0000000..afb0919
--- /dev/null
+++ b/schemagen/Matchup_NBA_NHL_XML/Matchup_NBA_NHL_XML.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" standalone="no" ?>\r
+<!DOCTYPE message PUBLIC "-//TSN//DTD Statistics 1.0/EN" "Matchup_NBA_NHL_XML.dtd">\r
+<message>\r
+<XML_File_ID>235677</XML_File_ID>\r
+<heading>ADX%MATCHUP-COL-VAN</heading>\r
+<category>Statistics</category>\r
+<sport>NHL</sport>\r
+<Title>NHL Matchup - Colorado at Vancouver</Title>\r
+<Matchup_Info>\r
+Colorado Avalanche (34-17-12-5) at Vancouver Canucks (36-20-8-4), 10 p.m.\r
+</Matchup_Info>\r
+<Head_To_Head_Record>\r
+<Record type="2003-04">Vancouver 2-1-2 (2-0-1 at Col; 0-1-1 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Head_To_Head_Record>\r
+<Record type="2002-03">Vancouver 3-2 (1-1 at Col; 2-1 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Head_To_Head_Record>\r
+<Record type="2001-02">Colorado 3-2 (2-1 at Col; 1-1 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Head_To_Head_Record>\r
+<Record type="2000-01">Colorado 3-2 (2-0 at Col; 1-2 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Home_Record>Colorado 17-13-5-1; Vancouver 17-10-5-0</Home_Record>\r
+<Away_Record>Colorado 17-4-7-4; Vancouver 19-10-3-4</Away_Record>\r
+<Division_Conference_Records>\r
+<Record_Vs Record_Type="Northwest Division">\r
+Colorado 10-7-4-0; Vancouver 8-6-5-1</Record_Vs>\r
+<Record_Vs Record_Type="Western Conference">\r
+Colorado 26-13-9-5; Vancouver 27-16-7-1</Record_Vs>\r
+</Division_Conference_Records>\r
+<Meetings Season="2003-2004">\r
+<Game>12/11 - Tied, 1-1 ot (at Van)</Game>\r
+<Game>12/29 - Vancouver, 3-2 (at Col)</Game>\r
+<Game>01/02 - Colorado, 4-2 (at Van)</Game>\r
+<Game>02/16 - Vancouver, 1-0 (at Col)</Game>\r
+<Game>03/03 - Tied, 5-5 ot (at Col)</Game>\r
+</Meetings>\r
+<Meetings Season="2002-2003">\r
+<Game>10/31 - Colorado, 5-1 (at Van)</Game>\r
+<Game>11/04 - Vancouver, 4-2 (at Col)</Game>\r
+<Game>12/11 - Vancouver, 3-1 (at Van)</Game>\r
+<Game>12/23 - Colorado, 5-3 (at Col)</Game>\r
+<Game>02/13 - Vancouver, 2-1 ot (at Van)</Game>\r
+</Meetings>\r
+<Meetings Season="2001-2002">\r
+<Game>10/09 - Colorado, 5-4 (at Col)</Game>\r
+<Game>10/13 - Vancouver, 4-0 (at Van)</Game>\r
+<Game>10/25 - Colorado, 4-1 (at Col)</Game>\r
+<Game>11/30 - Colorado, 5-2 (at Van)</Game>\r
+<Game>04/09 - Vancouver, 2-1 (at Col)</Game>\r
+</Meetings>\r
+<Matchup_Notes>\r
+<Note>\r
+Vancouver is unbeaten (1-0-1) in the last two meetings.\r
+</Note>\r
+<Note>\r
+Vancouver is 3-1-2 in the last six meetings.\r
+</Note>\r
+<Note>\r
+Vancouver is 5-2-2 in the last nine and 6-3-2 in the last 11 meetings.\r
+</Note>\r
+<Note>\r
+Vancouver is 7-6-2 in the last 15 meetings.\r
+</Note>\r
+<Note>\r
+These two teams are 9-9-2 in the last 20 meetings.\r
+</Note>\r
+<Note>\r
+Colorado is 15-10-4 in the last 29 meetings.\r
+</Note>\r
+<Note>\r
+Colorado snapped a three-game series road winless streak on 01/02/04.\r
+</Note>\r
+<Note>\r
+Colorado is unbeaten (1-0-1) in its last two at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 1-2-1 in its last four at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 3-2-1 in its last six at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 3-5-1 in its last nine at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 7-5-2 in its last 14 at Vancouver.\r
+</Note>\r
+<Note>\r
+Vancouver is unbeaten (2-0-1) in its last three at Colorado.\r
+</Note>\r
+<Note>\r
+Vancouver is 4-1-1 in its last six at Colorado.\r
+</Note>\r
+<Note>\r
+Vancouver is 4-5-1 in its last 10 and 5-8-2 in its last 15 at Colorado.\r
+</Note>\r
+<Note>\r
+Vancouver is 6-13-4 in its last 23 at Colorado.\r
+</Note>\r
+<Note>\r
+Colorado is 1-3-2-1 in its last seven and 2-6-2-1 in its last 11 games.\r
+</Note>\r
+<Note>\r
+Colorado is 8-1-2-2 in its last 13 road games.\r
+</Note>\r
+<Note>\r
+Colorado is 23-2-3 when leading after two periods this season.\r
+</Note>\r
+<Note>\r
+Vancouver is 4-1-1 in its last six and 5-2-1-1 in its last nine games.\r
+</Note>\r
+<Note>\r
+Vancouver has won three straight after losing its last three home games.\r
+</Note>\r
+<Note>\r
+Vancouver has won six of its last nine home games.\r
+</Note>\r
+<Note>\r
+Vancouver is 22-2-0 when leading after two periods this season.\r
+</Note>\r
+</Matchup_Notes>\r
+<Last_Five team="Colorado">\r
+<LF_Game>02/28 - L at  Columbus, 4-5 ot</LF_Game>\r
+<LF_Game>03/01 - L vs. Tampa Bay, 0-3</LF_Game>\r
+<LF_Game>03/03 - T vs. Vancouver, 5-5 ot</LF_Game>\r
+<LF_Game>03/05 - W vs. San Jose, 5-1</LF_Game>\r
+<LF_Game>03/07 - L vs. Calgary, 1-7</LF_Game>\r
+</Last_Five>\r
+<Last_Five team="Vancouver">\r
+<LF_Game>02/26 - W vs. San Jose, 3-2 ot</LF_Game>\r
+<LF_Game>02/28 - W vs. St. Louis, 2-0</LF_Game>\r
+<LF_Game>03/03 - T at  Colorado, 5-5 ot</LF_Game>\r
+<LF_Game>03/05 - L at  Detroit, 1-3</LF_Game>\r
+<LF_Game>03/06 - W at  Columbus, 4-0</LF_Game>\r
+</Last_Five>\r
+<time_stamp> March 8, 2004, at 12:51 PM ET </time_stamp>\r
+</message>\r

diff --git a/src/TSN/XML/GameInfo.hs b/src/TSN/XML/GameInfo.hs
index 691d9a992538d8230f64b44dcd98abdebd95547a..fdc11aed440408a5e7cff1423d76f31e2b56a9d6 100644 (file)
--- a/src/TSN/XML/GameInfo.hs
+++ b/src/TSN/XML/GameInfo.hs
@@ -65,7 +65,7 @@ dtds =
   [ "CBASK_Lineup_XML.dtd",
     "cbaskpreviewxml.dtd",
     "cflpreviewxml.dtd",
-    "Matchup_NBA_NHL_XML.dtd", -- missing DTD
+    "Matchup_NBA_NHL_XML.dtd",
     "mlbpreviewxml.dtd",
     "MLB_Gaming_Matchup_XML.dtd",
     "MLB.dtd", -- missing DTD
@@ -189,6 +189,7 @@ gameinfo_test_files =
   [ "test/xml/gameinfo/CBASK_Lineup_XML.xml",
     "test/xml/gameinfo/cbaskpreviewxml.xml",
     "test/xml/gameinfo/cflpreviewxml.xml",
+    "test/xml/gameinfo/Matchup_NBA_NHL_XML.xml",
     "test/xml/gameinfo/MLB_Gaming_Matchup_XML.xml",
     "test/xml/gameinfo/MLB_Lineup_XML.xml",
     "test/xml/gameinfo/MLB_Matchup_XML.xml",

diff --git a/test/xml/gameinfo/Matchup_NBA_NHL_XML.dtd b/test/xml/gameinfo/Matchup_NBA_NHL_XML.dtd
new file mode 100644 (file)
index 0000000..3e243ec
--- /dev/null
+++ b/test/xml/gameinfo/Matchup_NBA_NHL_XML.dtd
@@ -0,0 +1,42 @@
+<!ELEMENT message  (XML_File_ID, heading , category , sport , Title , Matchup_Info , Head_To_Head_Record+ , Home_Record , Away_Record , Current_Streak? , Division_Conference_Records , Meetings+ , Matchup_Notes , Last_Five+ , time_stamp )>\r
+\r
+<!ELEMENT XML_File_ID  (#PCDATA )>\r
+\r
+<!ELEMENT heading  (#PCDATA )>\r
+\r
+<!ELEMENT category  (#PCDATA )>\r
+\r
+<!ELEMENT sport  (#PCDATA )>\r
+\r
+<!ELEMENT Title  (#PCDATA )>\r
+\r
+<!ELEMENT Matchup_Info  (#PCDATA )>\r
+\r
+<!ELEMENT Head_To_Head_Record  (Record+ )>\r
+\r
+<!ELEMENT Record  (#PCDATA )>\r
+<!ATTLIST Record  type CDATA  #REQUIRED >\r
+<!ELEMENT Home_Record  (#PCDATA )>\r
+\r
+<!ELEMENT Away_Record  (#PCDATA )>\r
+\r
+<!ELEMENT Current_Streak  (#PCDATA )>\r
+\r
+<!ELEMENT Division_Conference_Records  (Record_Vs+ )>\r
+\r
+<!ELEMENT Record_Vs  (#PCDATA )>\r
+<!ATTLIST Record_Vs  Record_Type CDATA  #REQUIRED >\r
+<!ELEMENT Meetings  (Game+ )>\r
+<!ATTLIST Meetings  Season CDATA  #REQUIRED >\r
+<!ELEMENT Game  (#PCDATA )>\r
+\r
+<!ELEMENT Matchup_Notes  (Note+ )>\r
+\r
+<!ELEMENT Note  (#PCDATA )>\r
+\r
+<!ELEMENT Last_Five  (LF_Game+ )>\r
+<!ATTLIST Last_Five  team CDATA  #REQUIRED >\r
+<!ELEMENT LF_Game  (#PCDATA )>\r
+\r
+<!ELEMENT time_stamp  (#PCDATA )>\r
+\r

diff --git a/test/xml/gameinfo/Matchup_NBA_NHL_XML.xml b/test/xml/gameinfo/Matchup_NBA_NHL_XML.xml
new file mode 100644 (file)
index 0000000..afb0919
--- /dev/null
+++ b/test/xml/gameinfo/Matchup_NBA_NHL_XML.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" standalone="no" ?>\r
+<!DOCTYPE message PUBLIC "-//TSN//DTD Statistics 1.0/EN" "Matchup_NBA_NHL_XML.dtd">\r
+<message>\r
+<XML_File_ID>235677</XML_File_ID>\r
+<heading>ADX%MATCHUP-COL-VAN</heading>\r
+<category>Statistics</category>\r
+<sport>NHL</sport>\r
+<Title>NHL Matchup - Colorado at Vancouver</Title>\r
+<Matchup_Info>\r
+Colorado Avalanche (34-17-12-5) at Vancouver Canucks (36-20-8-4), 10 p.m.\r
+</Matchup_Info>\r
+<Head_To_Head_Record>\r
+<Record type="2003-04">Vancouver 2-1-2 (2-0-1 at Col; 0-1-1 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Head_To_Head_Record>\r
+<Record type="2002-03">Vancouver 3-2 (1-1 at Col; 2-1 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Head_To_Head_Record>\r
+<Record type="2001-02">Colorado 3-2 (2-1 at Col; 1-1 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Head_To_Head_Record>\r
+<Record type="2000-01">Colorado 3-2 (2-0 at Col; 1-2 at Van)</Record>\r
+</Head_To_Head_Record>\r
+<Home_Record>Colorado 17-13-5-1; Vancouver 17-10-5-0</Home_Record>\r
+<Away_Record>Colorado 17-4-7-4; Vancouver 19-10-3-4</Away_Record>\r
+<Division_Conference_Records>\r
+<Record_Vs Record_Type="Northwest Division">\r
+Colorado 10-7-4-0; Vancouver 8-6-5-1</Record_Vs>\r
+<Record_Vs Record_Type="Western Conference">\r
+Colorado 26-13-9-5; Vancouver 27-16-7-1</Record_Vs>\r
+</Division_Conference_Records>\r
+<Meetings Season="2003-2004">\r
+<Game>12/11 - Tied, 1-1 ot (at Van)</Game>\r
+<Game>12/29 - Vancouver, 3-2 (at Col)</Game>\r
+<Game>01/02 - Colorado, 4-2 (at Van)</Game>\r
+<Game>02/16 - Vancouver, 1-0 (at Col)</Game>\r
+<Game>03/03 - Tied, 5-5 ot (at Col)</Game>\r
+</Meetings>\r
+<Meetings Season="2002-2003">\r
+<Game>10/31 - Colorado, 5-1 (at Van)</Game>\r
+<Game>11/04 - Vancouver, 4-2 (at Col)</Game>\r
+<Game>12/11 - Vancouver, 3-1 (at Van)</Game>\r
+<Game>12/23 - Colorado, 5-3 (at Col)</Game>\r
+<Game>02/13 - Vancouver, 2-1 ot (at Van)</Game>\r
+</Meetings>\r
+<Meetings Season="2001-2002">\r
+<Game>10/09 - Colorado, 5-4 (at Col)</Game>\r
+<Game>10/13 - Vancouver, 4-0 (at Van)</Game>\r
+<Game>10/25 - Colorado, 4-1 (at Col)</Game>\r
+<Game>11/30 - Colorado, 5-2 (at Van)</Game>\r
+<Game>04/09 - Vancouver, 2-1 (at Col)</Game>\r
+</Meetings>\r
+<Matchup_Notes>\r
+<Note>\r
+Vancouver is unbeaten (1-0-1) in the last two meetings.\r
+</Note>\r
+<Note>\r
+Vancouver is 3-1-2 in the last six meetings.\r
+</Note>\r
+<Note>\r
+Vancouver is 5-2-2 in the last nine and 6-3-2 in the last 11 meetings.\r
+</Note>\r
+<Note>\r
+Vancouver is 7-6-2 in the last 15 meetings.\r
+</Note>\r
+<Note>\r
+These two teams are 9-9-2 in the last 20 meetings.\r
+</Note>\r
+<Note>\r
+Colorado is 15-10-4 in the last 29 meetings.\r
+</Note>\r
+<Note>\r
+Colorado snapped a three-game series road winless streak on 01/02/04.\r
+</Note>\r
+<Note>\r
+Colorado is unbeaten (1-0-1) in its last two at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 1-2-1 in its last four at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 3-2-1 in its last six at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 3-5-1 in its last nine at Vancouver.\r
+</Note>\r
+<Note>\r
+Colorado is 7-5-2 in its last 14 at Vancouver.\r
+</Note>\r
+<Note>\r
+Vancouver is unbeaten (2-0-1) in its last three at Colorado.\r
+</Note>\r
+<Note>\r
+Vancouver is 4-1-1 in its last six at Colorado.\r
+</Note>\r
+<Note>\r
+Vancouver is 4-5-1 in its last 10 and 5-8-2 in its last 15 at Colorado.\r
+</Note>\r
+<Note>\r
+Vancouver is 6-13-4 in its last 23 at Colorado.\r
+</Note>\r
+<Note>\r
+Colorado is 1-3-2-1 in its last seven and 2-6-2-1 in its last 11 games.\r
+</Note>\r
+<Note>\r
+Colorado is 8-1-2-2 in its last 13 road games.\r
+</Note>\r
+<Note>\r
+Colorado is 23-2-3 when leading after two periods this season.\r
+</Note>\r
+<Note>\r
+Vancouver is 4-1-1 in its last six and 5-2-1-1 in its last nine games.\r
+</Note>\r
+<Note>\r
+Vancouver has won three straight after losing its last three home games.\r
+</Note>\r
+<Note>\r
+Vancouver has won six of its last nine home games.\r
+</Note>\r
+<Note>\r
+Vancouver is 22-2-0 when leading after two periods this season.\r
+</Note>\r
+</Matchup_Notes>\r
+<Last_Five team="Colorado">\r
+<LF_Game>02/28 - L at  Columbus, 4-5 ot</LF_Game>\r
+<LF_Game>03/01 - L vs. Tampa Bay, 0-3</LF_Game>\r
+<LF_Game>03/03 - T vs. Vancouver, 5-5 ot</LF_Game>\r
+<LF_Game>03/05 - W vs. San Jose, 5-1</LF_Game>\r
+<LF_Game>03/07 - L vs. Calgary, 1-7</LF_Game>\r
+</Last_Five>\r
+<Last_Five team="Vancouver">\r
+<LF_Game>02/26 - W vs. San Jose, 3-2 ot</LF_Game>\r
+<LF_Game>02/28 - W vs. St. Louis, 2-0</LF_Game>\r
+<LF_Game>03/03 - T at  Colorado, 5-5 ot</LF_Game>\r
+<LF_Game>03/05 - L at  Detroit, 1-3</LF_Game>\r
+<LF_Game>03/06 - W at  Columbus, 4-0</LF_Game>\r
+</Last_Five>\r
+<time_stamp> March 8, 2004, at 12:51 PM ET </time_stamp>\r
+</message>\r