Add a new newsxml sample with the new required team "id" attribute.

[dead/htsn-import.git] / test / xml / newsxml.dtd

diff --git a/test/xml/newsxml.dtd b/test/xml/newsxml.dtd
index 72c6e3ed4ee55e2e23820ad9ebbd1190a073fdfc..a6aa6833ec12e115c57e892317e941c6c87cbe9e 100644 (file)
--- a/test/xml/newsxml.dtd
+++ b/test/xml/newsxml.dtd
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by  () -->\r
-<!--DTD generated by XML Spy v3.5 NT (http://www.xmlspy.com)-->\r
-<!ELEMENT Editor (#PCDATA)>\r
-<!ELEMENT P (#PCDATA)>\r
-<!ELEMENT SMS (#PCDATA)>\r
-<!ELEMENT XML_File_ID (#PCDATA)>\r
-<!ELEMENT category (#PCDATA)>\r
-<!ELEMENT city (#PCDATA)>\r
-<!ELEMENT continue (P+)>\r
-<!ELEMENT country (#PCDATA)>\r
-<!ELEMENT heading (#PCDATA)>\r
-<!ELEMENT location (city, state, country)>\r
-<!ELEMENT message (XML_File_ID, heading, msg_id, category, sport, url, team+, location+, SMS, Editor, text, continue, time_stamp)>\r
-<!ELEMENT msg_id (#PCDATA)>\r
-<!ATTLIST msg_id\r
-       EventId CDATA #REQUIRED\r
->\r
-<!ELEMENT sport (#PCDATA)>\r
-<!ELEMENT state (#PCDATA)>\r
-<!ELEMENT team (#PCDATA)>\r
-<!ELEMENT text (#PCDATA)>\r
-<!ELEMENT time_stamp (#PCDATA)>\r
-<!ELEMENT url (#PCDATA)>\r
+<!ELEMENT XML_File_ID (#PCDATA)>
+<!ELEMENT heading (#PCDATA)>
+<!ELEMENT msg_id (#PCDATA)>
+<!ELEMENT category (#PCDATA)>
+<!ELEMENT sport (#PCDATA)>
+<!ELEMENT url (#PCDATA)>
+<!ELEMENT team (#PCDATA)>
+<!ELEMENT city (#PCDATA)>
+<!ELEMENT state (#PCDATA)>
+<!ELEMENT country (#PCDATA)>
+<!ELEMENT location ( ( ( city, state )?, country ) )>
+<!ELEMENT SMS (#PCDATA)>
+<!ELEMENT text (#PCDATA)>
+<!ELEMENT P (#PCDATA)>
+<!ELEMENT continue ( P* )>
+<!ELEMENT time_stamp (#PCDATA)>
+<!ELEMENT message ( ( XML_File_ID, heading, msg_id, category, sport, url, team*, location*, SMS, ( Editor?, text, continue )?, time_stamp ) )>
+<!ELEMENT Editor (#PCDATA)>
+
+<!ATTLIST msg_id EventId CDATA #REQUIRED>
+
+<!-- The team id used to be nonexistent, now it's required. -->
+<!ATTLIST team id CDATA #REQUIRED>