You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/04/07 21:18:25 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xslt StylesheetHandler.java
mmidy 00/04/07 12:18:25
Modified: src/org/apache/xalan/xslt StylesheetHandler.java
Log:
Fix problem with base ID for imported and included stylesheets.
Revision Changes Path
1.28 +4 -3 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- StylesheetHandler.java 2000/03/29 03:51:58 1.27
+++ StylesheetHandler.java 2000/04/07 19:18:24 1.28
@@ -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!");
@@ -1234,7 +1235,7 @@
{
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();
@@ -1331,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))