fixed GH# 128: DOMWriter incorrectly adds SYSTEM keyword to DTD if PUBLIC is already specified

obiltschnig · obiltschnig · commit 173f205cb622 · 2013-05-24T23:13:03.000+02:00
diff --git a/XML/src/XMLWriter.cpp b/XML/src/XMLWriter.cpp
@@ -493,7 +493,11 @@ void XMLWriter::startDTD(const XMLString& name, const XMLString& publicId, const
 	}
 	if (!systemId.empty())
 	{
-		writeMarkup(" SYSTEM \"");
+		if (publicId.empty())
+		{
+			writeMarkup(" SYSTEM");
+		}
+		writeMarkup(" \"");
 		writeXML(systemId);
 		writeMarkup("\"");
 	}
diff --git a/XML/testsuite/src/XMLWriterTest.cpp b/XML/testsuite/src/XMLWriterTest.cpp
@@ -1,7 +1,7 @@
 //
 // XMLWriterTest.cpp
 //
-// $Id: //poco/1.4/XML/testsuite/src/XMLWriterTest.cpp#3 $
+// $Id: //poco/1.4/XML/testsuite/src/XMLWriterTest.cpp#4 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -169,6 +169,24 @@ void XMLWriterTest::testDTD()
 }
 
 
+void XMLWriterTest::testDTDPublic()
+{
+	std::ostringstream str;
+	XMLWriter writer(str, XMLWriter::WRITE_XML_DECLARATION);
+	writer.setNewLine("\n");
+	writer.startDocument();
+	writer.startDTD("test", "test", "http://www.appinf.com/DTDs/test");
+	writer.endDTD();
+	writer.startElement("", "", "foo");
+	writer.endElement("", "", "foo");
+	writer.endDocument();
+	std::string xml = str.str();
+	assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+	               "<!DOCTYPE test PUBLIC \"test\" \"http://www.appinf.com/DTDs/test\">"
+	               "<foo/>");
+}
+
+
 void XMLWriterTest::testDTDNotation()
 {
 	std::ostringstream str;
@@ -621,6 +639,7 @@ CppUnit::Test* XMLWriterTest::suite()
 	CppUnit_addTest(pSuite, XMLWriterTest, testTrivialFragmentPretty);
 	CppUnit_addTest(pSuite, XMLWriterTest, testDTDPretty);
 	CppUnit_addTest(pSuite, XMLWriterTest, testDTD);
+	CppUnit_addTest(pSuite, XMLWriterTest, testDTDPublic);
 	CppUnit_addTest(pSuite, XMLWriterTest, testDTDNotation);
 	CppUnit_addTest(pSuite, XMLWriterTest, testDTDEntity);
 	CppUnit_addTest(pSuite, XMLWriterTest, testAttributes);
diff --git a/XML/testsuite/src/XMLWriterTest.h b/XML/testsuite/src/XMLWriterTest.h
@@ -1,7 +1,7 @@
 //
 // XMLWriterTest.h
 //
-// $Id: //poco/1.4/XML/testsuite/src/XMLWriterTest.h#1 $
+// $Id: //poco/1.4/XML/testsuite/src/XMLWriterTest.h#2 $
 //
 // Definition of the XMLWriterTest class.
 //
@@ -54,6 +54,7 @@ class XMLWriterTest: public CppUnit::TestCase
 	void testTrivialFragmentPretty();
 	void testDTDPretty();
 	void testDTD();
+	void testDTDPublic();
 	void testDTDNotation();
 	void testDTDEntity();
 	void testAttributes();

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,11 @@ void XMLWriter::startDTD(const XMLString& name, const XMLString& publicId, const`
`493`	`493`	`}`
`494`	`494`	`if (!systemId.empty())`
`495`	`495`	`{`
`496`		`- writeMarkup(" SYSTEM \"");`
	`496`	`+ if (publicId.empty())`
	`497`	`+ {`
	`498`	`+ writeMarkup(" SYSTEM");`
	`499`	`+ }`
	`500`	`+ writeMarkup(" \"");`
`497`	`501`	`writeXML(systemId);`
`498`	`502`	`writeMarkup("\"");`
`499`	`503`	`}`