Author: atsushi
Date: 2005-04-11 06:03:04 -0400 (Mon, 11 Apr 2005)
New Revision: 42780
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlRelaxngSupport.cs
Log:
2005-04-11 Atsushi Enomoto <[EMAIL PROTECTED]>
* NvdlRelaxngSupport.cs : added PlanAtt validation support.
Modified: trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
2005-04-11 10:01:16 UTC (rev 42779)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/ChangeLog
2005-04-11 10:03:04 UTC (rev 42780)
@@ -1,3 +1,7 @@
+2005-04-11 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * NvdlRelaxngSupport.cs : added PlanAtt validation support.
+
2005-04-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* NvdlValidator.cs : fixed warning.
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlRelaxngSupport.cs
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlRelaxngSupport.cs
2005-04-11 10:01:16 UTC (rev 42779)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlRelaxngSupport.cs
2005-04-11 10:03:04 UTC (rev 42780)
@@ -46,14 +46,14 @@
internal class NvdlRelaxngValidatorGenerator : NvdlValidatorGenerator
{
- RelaxngPattern compiledPattern;
+ RelaxngPattern pattern;
+ RelaxngPattern attributePattern;
public NvdlRelaxngValidatorGenerator (RelaxngPattern p,
NvdlConfig config)
{
// FIXME: use XmlResolver
- p.Compile ();
- compiledPattern = p;
+ pattern = p;
}
public override XmlReader CreateValidator (XmlReader reader,
@@ -62,11 +62,28 @@
// XmlResolver is never used.
RelaxngValidatingReader rvr =
new RelaxngValidatingReader (
- reader, compiledPattern);
+ reader, pattern);
rvr.ReportDetails = true;
return rvr;
}
+ public override XmlReader CreateAttributeValidator (
+ XmlReader reader,
+ XmlResolver resolver)
+ {
+ if (attributePattern == null) {
+ RelaxngElement el = new RelaxngElement ();
+ el.NameClass = new RelaxngAnyName ();
+ el.Patterns.Add (pattern);
+ }
+ // XmlResolver is never used.
+ RelaxngValidatingReader rvr =
+ new RelaxngValidatingReader (
+ reader, attributePattern);
+ rvr.ReportDetails = true;
+ return rvr;
+ }
+
public override bool AddOption (string name, string arg)
{
return false;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches