X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2Fxml%2Fnewsxml.dtd;h=20938a28ceecf1ec695cbd712fd63e2fe5895330;hb=5a8d0ad5929fb297c74ea0802c11f9aa94b25ce7;hp=72c6e3ed4ee55e2e23820ad9ebbd1190a073fdfc;hpb=1e33fbb88722cd645f96017771072b6141bb795c;p=dead%2Fhtsn-import.git

diff --git a/test/xml/newsxml.dtd b/test/xml/newsxml.dtd
index 72c6e3e..20938a2 100644
--- a/test/xml/newsxml.dtd
+++ b/test/xml/newsxml.dtd
@@ -1,24 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by  () -->
-<!--DTD generated by XML Spy v3.5 NT (http://www.xmlspy.com)-->
-<!ELEMENT Editor (#PCDATA)>
-<!ELEMENT P (#PCDATA)>
-<!ELEMENT SMS (#PCDATA)>
-<!ELEMENT XML_File_ID (#PCDATA)>
-<!ELEMENT category (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT continue (P+)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT heading (#PCDATA)>
-<!ELEMENT location (city, state, country)>
-<!ELEMENT message (XML_File_ID, heading, msg_id, category, sport, url, team+, location+, SMS, Editor, text, continue, time_stamp)>
-<!ELEMENT msg_id (#PCDATA)>
-<!ATTLIST msg_id
-	EventId CDATA #REQUIRED
->
-<!ELEMENT sport (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT team (#PCDATA)>
-<!ELEMENT text (#PCDATA)>
-<!ELEMENT time_stamp (#PCDATA)>
-<!ELEMENT url (#PCDATA)>
+<!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>