Merge pull request #68 from edmcouncil/67-xml-prefix-is-​​not-omitted-when-generating-a-dtd-subset-in-a-file-formatted-as-sorted-rdfxml

mereolog · web-flow · commit 4d61582022cc · 2024-03-22T14:17:51.000+01:00
Skip adding '<!ENTITY xml "http://www.w3.org/XML/1998/namespace">' entry in sorted RDF/XML format
diff --git a/src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedRdfXmlWriter.java b/src/main/java/org/edmcouncil/rdf_toolkit/writer/SortedRdfXmlWriter.java
@@ -210,7 +210,7 @@ protected void writeHeader(Writer out, SortedTurtleObjectList importList, String
       output.startDTD("rdf:RDF");
       if (namespaceTable.size() > 0) {
         for (String prefix : prefixes) {
-          if (USE_GENERATED_PREFIXES || !generatedNamespaceTable.containsKey(prefix)) {
+          if ((USE_GENERATED_PREFIXES || !generatedNamespaceTable.containsKey(prefix)) && !"xml".equals(prefix)) {
             if (prefix.length() >= 1) {
               output.writeDtdEntity(prefix, namespaceTable.get(prefix));
             }

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ protected void writeHeader(Writer out, SortedTurtleObjectList importList, String`
`210`	`210`	`output.startDTD("rdf:RDF");`
`211`	`211`	`if (namespaceTable.size() > 0) {`
`212`	`212`	`for (String prefix : prefixes) {`
`213`		`- if (USE_GENERATED_PREFIXES \|\| !generatedNamespaceTable.containsKey(prefix)) {`
	`213`	`+ if ((USE_GENERATED_PREFIXES \|\| !generatedNamespaceTable.containsKey(prefix)) && !"xml".equals(prefix)) {`
`214`	`214`	`if (prefix.length() >= 1) {`
`215`	`215`	`output.writeDtdEntity(prefix, namespaceTable.get(prefix));`
`216`	`216`	`}`