2005-06-05 Peter Bartok <pbartok@novell.com>

[mono.git] / mcs / class / System.Data.SqlXml / System.Xml.Query / XQueryCommand.cs

diff --git a/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryCommand.cs b/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryCommand.cs
index 3b4c841a393a2b4da35b1dc1e5b94d806567b53a..40d1bd748002e259589e35a32fda2eb6151ed849 100755 (executable)
--- a/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryCommand.cs
+++ b/mcs/class/System.Data.SqlXml/System.Xml.Query/XQueryCommand.cs
@@ -51,7 +51,7 @@ namespace System.Xml.Query
 \r
                static XQueryCommand ()\r
                {\r
-                       implType = typeof (XPathNavigator).Assembly.GetType ("Mono.Xml.XQuery.XQueryCommandImpl");\r
+                       implType = typeof (XPathNavigator).Assembly.GetType ("Mono.Xml.XPath2.XQueryCommandImpl");\r
                        compileMethod = implType.GetMethod ("Compile");\r
                        executeMethod = implType.GetMethod ("Execute");\r
                        if (compileMethod == null)\r
@@ -72,6 +72,12 @@ namespace System.Xml.Query
 \r
                object impl;\r
 \r
+               #region Event\r
+\r
+               public event QueryEventHandler OnMessageEvent;\r
+\r
+               #endregion\r
+\r
                #region Methods\r
 \r
                // Compile\r
@@ -96,7 +102,7 @@ namespace System.Xml.Query
                [MonoTODO]\r
                public void Compile (TextReader query, Evidence evidence)\r
                {\r
-                       compileMethod.Invoke (impl, new object [] {query, evidence});\r
+                       compileMethod.Invoke (impl, new object [] {query, evidence, this});\r
                }\r
 \r
                // Execute\r
@@ -114,7 +120,7 @@ namespace System.Xml.Query
                        XmlResolver dataSources, \r
                        TextWriter results)\r
                {\r
-                       XmlTextWriter w = new XmlTextWriter (results);\r
+                       XmlWriter w = XmlWriter.Create (results);\r
                        Execute (dataSources, null, w);\r
                }\r
 \r
@@ -123,7 +129,7 @@ namespace System.Xml.Query
                        XmlResolver dataSources, \r
                        XmlWriter results)\r
                {\r
-                       Execute ((IXPathNavigable) null, dataSources, null, results);\r
+                       Execute (new XPathDocument (), dataSources, null, results);\r
                }\r
 \r
                [MonoTODO ("Null args allowed?")]\r
@@ -177,7 +183,7 @@ namespace System.Xml.Query
                        XmlArgumentList args,\r
                        XmlWriter results)\r
                {\r
-                       Execute (new XPathDocument (), dataSources, args, results);\r
+                       Execute ((XPathNavigator) null, dataSources, args, results);\r
                }\r
 \r
                [MonoTODO]\r
@@ -187,7 +193,7 @@ namespace System.Xml.Query
                        XmlArgumentList args,\r
                        XmlWriter results)\r
                {\r
-                       Execute (contextDocument.CreateNavigator (), dataSources, args, results);\r
+                       Execute (contextDocument != null ? contextDocument.CreateNavigator () : null, dataSources, args, results);\r
                }\r
 \r
                [MonoTODO]\r