mmidy 00/04/07 12:39:28
Modified: src/org/apache/xalan/xslt Tag: Bxalan_1_0_0
StylesheetHandler.java
Log:
Fix problem with base ID and imported and included stylesheets
Revision Changes Path
No revision
No revision
1.26.2.1 +5 -8
xml-xalan/src/org/apache/xalan/xslt/StylesheetHandler.java
Index: StylesheetHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xslt/StylesheetHandler.java,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -r1.26 -r1.26.2.1
--- StylesheetHandler.java 2000/03/02 18:56:42 1.26
+++ StylesheetHandler.java 2000/04/07 19:39:28 1.26.2.1
@@ -218,7 +218,7 @@
{
if(!m_processor.m_stylesheetLocatorStack.empty())
{
- Locator locator = (Locator)m_processor.m_stylesheetLocatorStack.pop();
+ m_processor.m_stylesheetLocatorStack.pop();
// System.out.println("popping locator for: "+locator.getPublicId());
}
// m_stylesheet.m_extensionNamespaces.clear();
@@ -1222,7 +1222,8 @@
String saved_XSLNameSpaceURL = m_stylesheet.m_XSLNameSpaceURL;
String href = atts.getValue(i);
- URL hrefUrl = m_processor.getURLFromString(href,
m_stylesheet.m_baseIdent);
+ URL hrefUrl = m_processor.getURLFromString(href,
//m_stylesheet.m_baseIdent);
+
((URL)m_stylesheet.m_includeStack.peek()).toString());
if(stackContains(m_stylesheet.m_stylesheetRoot.m_importStack,
hrefUrl))
{
throw new
SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_IMPORTING_ITSELF,
new Object[] {hrefUrl})); //"(StylesheetHandler) "+hrefUrl+" is directly or
indirectly importing itself!");
@@ -1232,13 +1233,9 @@
try
{
- String[] stringHolder =
- {
- null};
-
Stylesheet importedStylesheet
= new Stylesheet(m_stylesheet.m_stylesheetRoot,
- m_processor, m_stylesheet.m_baseIdent);
+ m_processor, hrefUrl.toExternalForm());
//m_stylesheet.m_baseIdent);
StylesheetHandler tp = new StylesheetHandler(m_processor,
importedStylesheet);
importedStylesheet.m_baseIdent = hrefUrl.toExternalForm();
@@ -1335,7 +1332,7 @@
String href = atts.getValue(i);
URL hrefUrl
- = m_processor.getURLFromString(href,
+ = m_processor.getURLFromString(href,
((URL)m_stylesheet.m_includeStack.peek()).toString());
if(stackContains(m_stylesheet.m_includeStack, hrefUrl))
