Update of /cvsroot/mvp-xml/nxslt/v2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5474/v2/src
Modified Files:
NxsltMain.cs
Log Message:
Index: NxsltMain.cs
===================================================================
RCS file: /cvsroot/mvp-xml/nxslt/v2/src/NxsltMain.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NxsltMain.cs 1 Dec 2005 16:18:53 -0000 1.2
+++ NxsltMain.cs 1 Dec 2005 16:56:38 -0000 1.3
@@ -117,7 +117,7 @@
{
//To get stylesheet from the PI we load source XML into
//XPathDocument (consider embedded stylesheet)
- XPathDocument srcDoc = new XPathDocument(srcReader);
+ XPathDocument srcDoc = new XPathDocument(srcReader, XmlSpace.Preserve);
XPathNavigator srcNav = srcDoc.CreateNavigator();
//Now srcReader reads in-memory cache instead
srcReader = srcNav.ReadSubtree();
@@ -157,7 +157,7 @@
FileStream fs;
try
{
- fs = File.OpenWrite(options.OutFile);
+ fs = File.Open(options.OutFile, FileMode.Create);
}
catch
{
@@ -165,7 +165,7 @@
}
try
{
- XmlWriter results = XmlWriter.Create(fs, xslt.OutputSettings);
+ XmlOutput results = new XmlOutput(fs);
TransformImpl(srcReader, xslt, resolver, results);
}
finally
@@ -176,7 +176,7 @@
else
{
//Transform to Console
- XmlWriter results = XmlWriter.Create(Console.Out, xslt.OutputSettings);
+ XmlOutput results = new XmlOutput(Console.Out);
TransformImpl(srcReader, xslt, resolver, results);
}
//Save transfomation time
@@ -190,12 +190,12 @@
/// <summary>
/// Actual transformation and error handling.
/// </summary>
- private void TransformImpl(XmlReader srcReader, MvpXslTransform xslt, XmlResolver resolver, XmlWriter results)
+ private void TransformImpl(XmlReader srcReader, MvpXslTransform xslt, XmlResolver resolver, XmlOutput results)
{
xslt.MultiOutput = options.MultiOutput;
try
{
- xslt.Transform(new XmlInput(srcReader, resolver), options.XslArgList, new XmlOutput(results));
+ xslt.Transform(new XmlInput(srcReader, resolver), options.XslArgList, results);
}
catch (XmlException xe)
{
@@ -320,7 +320,7 @@
private XmlReader PrepareSourceReader()
{
XmlReaderSettings srcReaderSettings = new XmlReaderSettings();
- srcReaderSettings.ProhibitDtd = false;
+ srcReaderSettings.ProhibitDtd = false;
if (options.StripWhiteSpace || options.PrettyPrintMode)
{
srcReaderSettings.IgnoreWhitespace = true;
@@ -333,7 +333,7 @@
srcReaderSettings.XmlResolver = null;
else
{
- XmlResolver srcResolver = Utils.GetXmlResolver(options.SourceCredential, options);
+ srcReaderSettings.XmlResolver = Utils.GetXmlResolver(options.SourceCredential, options);
}
XmlReader srcReader;
if (options.NoSourceXml)
|
