Add support for 3.3 and new custom dictionary terms

Author: DanSmith

Colectica.DDISchemaCheck.Checks/CustomWords.txt

@@ -14,6 +14,7 @@ lifecycle
 IDs
 
 dpi
+substage
 inline
 locator
 codelist
@@ -25,6 +26,8 @@ randomizable
 anonymized
 geo
 geo-referenced
+pre
+pre-election
 Georeferenced
 xmin
 xmax

Colectica.DDISchemaCheck.Checks/DetectSchemaType.cs

@@ -19,6 +19,7 @@ public static bool GetTestResult(string filename, out string content)
                 string formatVersion = string.Empty;
                 if (format == DdiFileFormat.Ddi31) { formatVersion = "3.1"; }
                 else if (format == DdiFileFormat.Ddi32) { formatVersion = "3.2"; }
+                else if (format == DdiFileFormat.Ddi33) { formatVersion = "3.3"; }
                 b.Append(string.Format("<div class=\"alert alert-success\"></span>Detected DDI Schema for Lifecycle version {0}</div>", formatVersion));
                 return true;
             }
@@ -62,6 +63,10 @@ public static DdiFileFormat GetSchemaFileFormat(string filename)
                         {
                             return DdiFileFormat.Ddi31;
                         }
+                        else if (string.Compare(attribute, "ddi:instance:3_3", true) == 0)
+                        {
+                            return DdiFileFormat.Ddi33;
+                        }
                         throw new InvalidOperationException("The schema file is using an unknown namespace.");
                     }
                     throw new InvalidOperationException("The .xsd file was empty.");
@@ -81,6 +86,7 @@ public enum DdiFileFormat
         Ddi25 = 1,
         Ddi31 = 2,
         Ddi32 = 4,
+        Ddi33 = 5,
     }
 
 }

Colectica.DDISchemaCheck.Checks/ValidateSchema.cs

@@ -97,12 +97,13 @@ public XmlSchemaSet GetSchema(string filename)
             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))
             {