IsValid (XML RelaxNG) now takes xml strings

vvvv · Aug 28, 2012 · f386448 · f386448
1 parent e8a9cb9
commit f386448
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/vvvv45/src/nodes/plugins/XML/XMLNodeWrappers.cs b/vvvv45/src/nodes/plugins/XML/XMLNodeWrappers.cs
@@ -364,11 +364,11 @@ public void Evaluate(int spreadMax)
     }
 
 
-    [PluginInfo(Name = "Validate", Category = "XML RelaxNG")]
+    [PluginInfo(Name = "IsValid", Category = "XML RelaxNG")]
     public class RelaxNGValidateNode : IPluginEvaluate
     {
-        [Input("Xml File", StringType = StringType.Filename, FileMask = "XML (*.xml)|*.xml")]
-        public IDiffSpread<string> XmlFile;
+        [Input("Xml String")]
+        public IDiffSpread<string> Xml;
 
         [Input("Rng File", StringType = StringType.Filename, FileMask = "RNC (*.rnc)|*.rnc|RNG (*.rng)|*rng")]
         public IDiffSpread<string> RngFile;
@@ -381,14 +381,14 @@ public class RelaxNGValidateNode : IPluginEvaluate
 
         public void Evaluate(int spreadMax)
         {
-            if (!XmlFile.IsChanged && !RngFile.IsChanged) return;
+            if (!Xml.IsChanged && !RngFile.IsChanged) return;
 
             Message.SliceCount = spreadMax;
             Valid.SliceCount = spreadMax;
 
             for (int i = 0; i < spreadMax; i++)
             {
-                var message = XMLNodes.RelaxNGValidate(XmlFile[i], RngFile[i]);
+                var message = XMLNodes.RelaxNGValidate(Xml[i], RngFile[i]);
                 Message[i] = message;
                 Valid[i] = message == "";
             }

diff --git a/vvvv45/src/nodes/plugins/XML/XMLNodes.cs b/vvvv45/src/nodes/plugins/XML/XMLNodes.cs
@@ -158,13 +158,11 @@ public static string AsString(this XElement element)
         }
 
         [Node]
-        public static string RelaxNGValidate(string xmlFile, string rngFile)
+        public static string RelaxNGValidate(string xml, string rngFile)
         {
             string r = "\r\n";
 
             // Files must exist.
-            if (!File.Exists(xmlFile))
-                return "Source file not found.";
             if (!File.Exists(rngFile))
                 return "Schema file not found.";
 
@@ -211,8 +209,11 @@ public static string RelaxNGValidate(string xmlFile, string rngFile)
             else
                 return "Unknown schema file extension: " + Path.GetExtension(rngFile);
 
+            byte[] byteArray = Encoding.ASCII.GetBytes(xml);
+            MemoryStream stream = new MemoryStream(byteArray);
+
             // Validate instance.
-            XmlTextReader xtrXml = new XmlTextReader(xmlFile);
+            XmlTextReader xtrXml = new XmlTextReader(stream);
             RelaxngValidatingReader vr = new RelaxngValidatingReader(xtrXml, p);
             try
             {