Allow DTD inclusions in reusable

Allow DTD inclusions in reusable
expanded messages

Author: DanSmith

Colectica.DDISchemaCheck.Checks/DetectSchemaType.cs

@@ -38,7 +38,10 @@ public static DdiFileFormat GetSchemaFileFormat(string filename)
         {
             try
             {
-                using (XmlReader xmlReader = XmlReader.Create(filename))
+                XmlReaderSettings settings = new XmlReaderSettings();
+                settings.DtdProcessing = DtdProcessing.Parse;
+
+                using (XmlReader xmlReader = XmlReader.Create(filename, settings))
                 {
                     if (xmlReader.MoveToContent() == XmlNodeType.Element)
                     {

Colectica.DDISchemaCheck.Checks/EnsureReferencability.cs

@@ -85,7 +85,7 @@ public static string GetTestResult(XmlSchemaSet schema)
 
             if (noChoice.Count > 0)
             {
-                b.Append(@"<div class=""alert alert-danger"">Versionables and Maintainables not in a xs:Choice.</div>");
+                b.Append(@"<div class=""alert alert-danger"">Versionables and Maintainables not in a referenceable xs:Choice format.</div>");
                 b.AppendLine(@"<table class=""table"">
                                 <thead>
                                   <tr>
@@ -108,12 +108,12 @@ public static string GetTestResult(XmlSchemaSet schema)
             }
             else
             {
-                b.Append("<div class=\"alert alert-success\">All Versionables and Maintainables are in a xs:Choice.</div>");
+                b.Append("<div class=\"alert alert-success\">All Versionables and Maintainables are in a referenceable xs:Choice format.</div>");
             }
 
             if (wrongNumberChoice.Count > 0)
             {
-                b.Append(@"<div class=""alert alert-danger"">Wrong number of elements in Versionables and Maintainables xs:Choice.</div>");
+                b.Append(@"<div class=""alert alert-danger"">Wrong number of elements in Versionables and Maintainables referenceable xs:Choice format.</div>");
                 b.AppendLine(@"<table class=""table"">
                                 <thead>
                                   <tr>
@@ -136,12 +136,12 @@ public static string GetTestResult(XmlSchemaSet schema)
             }
             else
             {
-                b.Append("<div class=\"alert alert-success\">Correct number of elements in all Versionables and Maintainables xs:Choice.</div>");
+                b.Append("<div class=\"alert alert-success\">Correct number of elements in all Versionables and Maintainables referenceable xs:Choice format.</div>");
             }
 
             if (wrongFormatChoice.Count > 0)
             {
-                b.Append(@"<div class=""alert alert-danger"">Missing xxxReference to Versionables and Maintainables in xs:Choice.</div>");
+                b.Append(@"<div class=""alert alert-danger"">Missing xxxReference to Versionables and Maintainables in referenceable xs:Choice format.</div>");
                 b.AppendLine(@"<table class=""table"">
                                 <thead>
                                   <tr>
@@ -164,7 +164,7 @@ public static string GetTestResult(XmlSchemaSet schema)
             }
             else
             {
-                b.Append("<div class=\"alert alert-success\">Correct number of elements in all Versionables and Maintainables xs:Choice.</div>");
+                b.Append("<div class=\"alert alert-success\">Correct number of elements in all Versionables and Maintainables referenceable xs:Choice format.</div>");
             }
 
             return b.ToString();

Colectica.DDISchemaCheck.Checks/FragmentContainsItem.cs

@@ -129,7 +129,7 @@ public static string GetTestResult(XmlSchemaSet schemas)
             }
             else
             {
-                b.Append("<div class=\"alert alert-success\">No duplicate Element names detected for referenceable types.</div>");
+                b.Append("<div class=\"alert alert-success\">All Versionables and Maintainables found with FragmentInstance inclusion.</div>");
             }
 
             return b.ToString();

Colectica.DDISchemaCheck.Checks/ValidateSchema.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -92,7 +93,18 @@ public XmlSchemaSet GetSchema(string filename)
         {
             XmlSchemaSet xmlSchemaSet = new XmlSchemaSet();
             xmlSchemaSet.ValidationEventHandler += new ValidationEventHandler(ValidationCallback);
-            using (XmlTextReader reader = new XmlTextReader(filename))
+            XmlReaderSettings settings = new XmlReaderSettings();
+            settings.DtdProcessing = DtdProcessing.Parse;
+
+            // since there is a DTD entity in reusable, This is the only way I can get it to resolve
+            string reusable = Path.GetDirectoryName(filename) + Path.DirectorySeparatorChar +"reusable.xsd";
+            using (XmlReader reader = XmlReader.Create(reusable, settings))
+            {
+                XmlSchema xmlSchema = XmlSchema.Read(reader, new ValidationEventHandler(ValidationCallback));
+                xmlSchemaSet.Add(xmlSchema);
+            }
+
+            using (XmlReader reader = XmlReader.Create(filename, settings))
             {
                 XmlSchema xmlSchema = XmlSchema.Read(reader, new ValidationEventHandler(ValidationCallback));
                 xmlSchemaSet.Add(xmlSchema);