dbertoni 01/08/27 07:55:31
Modified: c/src/XSLT XSLTEngineImpl.cpp
Log:
Tweaked earlier fix.
Revision Changes Path
1.114 +19 -11 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- XSLTEngineImpl.cpp 2001/08/24 18:26:12 1.113
+++ XSLTEngineImpl.cpp 2001/08/27 14:55:31 1.114
@@ -836,9 +836,7 @@
}
}
else
- {
- // hmmm.. for now I'll rely on the XML parser to handle
- // fragment URLs.
+ {
diag(XalanDOMString(XALAN_STATIC_UCODE_STRING("========= Parsing and
preparing ")) +
localXSLURLString +
XALAN_STATIC_UCODE_STRING(" =========="));
@@ -846,9 +844,7 @@
XalanAutoPtr<Stylesheet> theGuard;
- if(isRoot)
- {
- const XalanDocument* const theOwnerDocument =
+ const XalanDocument* const theOwnerDocument =
fragBase.getNodeType() == XalanNode::DOCUMENT_NODE ?
#if defined(XALAN_OLD_STYLE_CASTS)
(const XalanDocument*)&fragBase :
@@ -856,13 +852,25 @@
static_cast<const XalanDocument*>(&fragBase) :
#endif
fragBase.getOwnerDocument();
- assert(theOwnerDocument != 0);
+ assert(theOwnerDocument != 0);
+ if (length(xmlBaseIdent) == 0)
+ {
+ localXSLURLString =
+ URISupport::getURLStringFromString(
+ localXSLURLString,
+
m_xpathEnvSupport.findURIFromDoc(theOwnerDocument));
+ }
+ else
+ {
localXSLURLString =
- URISupport::getURLStringFromString(
- localXSLURLString,
-
m_xpathEnvSupport.findURIFromDoc(theOwnerDocument));
+ URISupport::getURLStringFromString(
+ localXSLURLString,
+ xmlBaseIdent);
+ }
+ if(isRoot)
+ {
StylesheetRoot* const theLocalRoot =
constructionContext.create(localXSLURLString);
@@ -885,7 +893,7 @@
typedef StylesheetConstructionContext::URLAutoPtrType URLAutoPtrType;
- URLAutoPtrType
xslURL(constructionContext.getURLFromString(localXSLURLString, xmlBaseIdent));
+ URLAutoPtrType
xslURL(constructionContext.getURLFromString(localXSLURLString));
XSLTInputSource inputSource(xslURL->getURLText());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
