Menu
▾
▴
[mvp-xml-cvs] XInclude/v2/src SR.resx,1.1,1.2 TextIncludingReader.cs,1.1,1.2 XInclude.csproj,1.1,1.2 XIncludingReader.cs,1.1,1.2
|
From: Oleg T. <he...@us...> - 2005-10-29 11:51:44
|
Update of /cvsroot/mvp-xml/XInclude/v2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31153/v2/src Modified Files: SR.resx TextIncludingReader.cs XInclude.csproj XIncludingReader.cs Log Message: Index: XInclude.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v2/src/XInclude.csproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XInclude.csproj 28 Oct 2005 22:28:56 -0000 1.1 +++ XInclude.csproj 29 Oct 2005 11:51:35 -0000 1.2 @@ -113,6 +113,9 @@ <Link>Common\XPath\IHasXPathNavigator.cs</Link> <SubType>Code</SubType> </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\SubtreeeXPathNavigator.cs"> + <Link>Common\XPath\SubtreeeXPathNavigator.cs</Link> + </Compile> <Compile Include="..\..\..\Common\v2\src\XPath\XPathCache.cs"> <Link>Common\XPath\XPathCache.cs</Link> <SubType>Code</SubType> Index: XIncludingReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v2/src/XIncludingReader.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XIncludingReader.cs 28 Oct 2005 22:28:56 -0000 1.1 +++ XIncludingReader.cs 29 Oct 2005 11:51:35 -0000 1.2 @@ -78,12 +78,12 @@ { XmlTextReader xtr = reader as XmlTextReader; if (xtr != null) - { - XmlValidatingReader vr = new XmlValidatingReader(reader); + { + XmlValidatingReader vr = new XmlValidatingReader(reader); vr.ValidationType = ValidationType.None; vr.EntityHandling = EntityHandling.ExpandEntities; vr.ValidationEventHandler += new ValidationEventHandler( - ValidationCallback); + ValidationCallback); _normalization = xtr.Normalization; _whiteSpaceHandling = xtr.WhitespaceHandling; _reader = vr; @@ -655,7 +655,7 @@ if (_relativeBaseUri) { Uri baseUri = new Uri(_reader.BaseURI); - return _topBaseUri.MakeRelativeUri(baseUri).AbsoluteUri; + return _topBaseUri.MakeRelativeUri(baseUri).ToString(); } else return _reader.BaseURI; Index: SR.resx =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v2/src/SR.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SR.resx 28 Oct 2005 22:28:56 -0000 1.1 +++ SR.resx 29 Oct 2005 11:51:35 -0000 1.2 @@ -117,97 +117,97 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <data name="NotSupportedEncoding" type="System.String" mimetype="System.String"> + <data name="NotSupportedEncoding" xml:space="preserve"> <value>Not supported encoding '{0}'.</value> </data> - <data name="OutOfMemoryWhileFetchingResource" type="System.String" mimetype="System.String"> + <data name="OutOfMemoryWhileFetchingResource" xml:space="preserve"> <value>Out of memory error while reading resource '{0}'.</value> </data> - <data name="IOErrorWhileFetchingResource" type="System.String" mimetype="System.String"> + <data name="IOErrorWhileFetchingResource" xml:space="preserve"> <value>I/O error while reading resource '{0}'.</value> </data> - <data name="UnknownParseAttrValue" type="System.String" mimetype="System.String"> + <data name="UnknownParseAttrValue" xml:space="preserve"> <value>Unknown 'parse' attribute value: '{0}'.</value> </data> - <data name="UnknownParseAttrValueLong" type="System.String" mimetype="System.String"> + <data name="UnknownParseAttrValueLong" xml:space="preserve"> <value>Unknown 'parse' attribute value: '{0}'. In {1}, Line {2}, Position {3}.</value> </data> - <data name="NonXmlCharacter" type="System.String" mimetype="System.String"> + <data name="NonXmlCharacter" xml:space="preserve"> <value>Included document contains a character not allowed in XML: 0x{0}.</value> </data> - <data name="CircularInclusion" type="System.String" mimetype="System.String"> + <data name="CircularInclusion" xml:space="preserve"> <value>Circular inclusion has been detected, inclusion location: {0}.</value> </data> - <data name="CircularInclusionLong" type="System.String" mimetype="System.String"> + <data name="CircularInclusionLong" xml:space="preserve"> <value>Circular inclusion has been detected, inclusion location: {0}. In {1}, Line {2}, Position {3}.</value> </data> - <data name="FatalResourceException" type="System.String" mimetype="System.String"> + <data name="FatalResourceException" xml:space="preserve"> <value>Resource error has occured and no fallback has been provided: {0}.</value> </data> - <data name="AttributeOrNamespaceInIncludeLocationError" type="System.String" mimetype="System.String"> + <data name="AttributeOrNamespaceInIncludeLocationError" xml:space="preserve"> <value>Include location identifies an attribute or namespace node!</value> </data> - <data name="FallbackNotChildOfInclude" type="System.String" mimetype="System.String"> + <data name="FallbackNotChildOfInclude" xml:space="preserve"> <value>xi:fallback element must be direct child of xi:include element. Location: {0}.</value> </data> - <data name="FallbackNotChildOfIncludeLong" type="System.String" mimetype="System.String"> + <data name="FallbackNotChildOfIncludeLong" xml:space="preserve"> <value>xi:fallback element must be direct child of xi:include element. Location: {0}, Line {1}, Position {2}.</value> </data> - <data name="URISchemaNotSupported" type="System.String" mimetype="System.String"> + <data name="URISchemaNotSupported" xml:space="preserve"> <value>URI schema is not supported: '{0}'.</value> </data> - <data name="SecurityException" type="System.String" mimetype="System.String"> + <data name="SecurityException" xml:space="preserve"> <value>Security exception while fetching '{0}'.</value> </data> - <data name="ResourceError" type="System.String" mimetype="System.String"> + <data name="ResourceError" xml:space="preserve"> <value>Resource '{0}' cannot be fetched.</value> </data> - <data name="MissingHrefAndXpointerException" type="System.String" mimetype="System.String"> + <data name="MissingHrefAndXpointerException" xml:space="preserve"> <value>'href' or 'xpointer' attributes can't both be omitted on xi:include element. Location: {0}."</value> </data> - <data name="MissingHrefAndXpointerExceptionLong" type="System.String" mimetype="System.String"> + <data name="MissingHrefAndXpointerExceptionLong" xml:space="preserve"> <value>'href' or 'xpointer' attributes can't both be omitted on xi:include element. Location: {0}, Line {1}, Position {2}.</value> </data> - <data name="IntradocumentReferencesNotSupported" type="System.String" mimetype="System.String"> + <data name="IntradocumentReferencesNotSupported" xml:space="preserve"> <value>XIncludingReader doesn't support intra-document references.</value> </data> - <data name="CustomXmlResolverError" type="System.String" mimetype="System.String"> + <data name="CustomXmlResolverError" xml:space="preserve"> <value>An exception has occured during GetEntity call to custom XmlResolver.</value> </data> - <data name="CustomXmlResolverReturnedNull" type="System.String" mimetype="System.String"> + <data name="CustomXmlResolverReturnedNull" xml:space="preserve"> <value>Custom XmlResolver returned null.</value> </data> - <data name="CustomXmlResolverReturnedUnsupportedType" type="System.String" mimetype="System.String"> + <data name="CustomXmlResolverReturnedUnsupportedType" xml:space="preserve"> <value>Custom XmlResolver returned object of an unsupported type '{0}'.</value> </data> - <data name="InvalidURI" type="System.String" mimetype="System.String"> + <data name="InvalidURI" xml:space="preserve"> <value>Invalid URI '{0}'.</value> </data> - <data name="UnresolvableURI" type="System.String" mimetype="System.String"> + <data name="UnresolvableURI" xml:space="preserve"> <value>Unable to resolve URI reference '{0}'.</value> </data> - <data name="IncludeChildOfInclude" type="System.String" mimetype="System.String"> + <data name="IncludeChildOfInclude" xml:space="preserve"> <value>xi:include element cannot be child of xi:include element. Location: {0}.</value> </data> - <data name="IncludeChildOfIncludeLong" type="System.String" mimetype="System.String"> + <data name="IncludeChildOfIncludeLong" xml:space="preserve"> <value>xi:include element cannot be child of xi:include element. Location: {0}, Line {1}, Position {2}.</value> </data> - <data name="TwoFallbacks" type="System.String" mimetype="System.String"> + <data name="TwoFallbacks" xml:space="preserve"> <value>xi:include element cannot contain more than one xi:fallback element. Location: {0}.</value> </data> - <data name="TwoFallbacksLong" type="System.String" mimetype="System.String"> + <data name="TwoFallbacksLong" xml:space="preserve"> <value>xi:include element cannot contain more than one xi:fallback element. Location: {0}, Line {1}, Position {2}.</value> </data> - <data name="MalformedXInclusionResult" type="System.String" mimetype="System.String"> + <data name="MalformedXInclusionResult" xml:space="preserve"> <value>Malformed XInclusion result - xi:include element at the top level must include a single element and optional comments and PIs.</value> </data> - <data name="InvalidCharForAccept" type="System.String" mimetype="System.String"> + <data name="InvalidCharForAccept" xml:space="preserve"> <value>'accept' attribute contains a character not allowed in HTTP header: 0x{0}.</value> </data> - <data name="FragmentIDInHref" type="System.String" mimetype="System.String"> + <data name="FragmentIDInHref" xml:space="preserve"> <value>Fragment identifiers must not be used in 'href' attribute.</value> </data> - <data name="UnknownXIncludeElement" type="System.String" mimetype="System.String"> + <data name="UnknownXIncludeElement" xml:space="preserve"> <value>Unknown element in the XInclude namespace has been detected: {0}.</value> </data> </root> \ No newline at end of file Index: TextIncludingReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v2/src/TextIncludingReader.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TextIncludingReader.cs 28 Oct 2005 22:28:56 -0000 1.1 +++ TextIncludingReader.cs 29 Oct 2005 11:51:35 -0000 1.2 @@ -295,6 +295,7 @@ private Encoding GetEncodingFromXMLDecl(string href) { XmlTextReader tmpReader = new XmlTextReader(href); + tmpReader.ProhibitDtd = false; tmpReader.WhitespaceHandling = WhitespaceHandling.None; try { |
