morrijr 01/10/19 04:44:55
Modified: src/org/apache/cocoon/transformation
XIncludeTransformer.java
Log:
current_xmlbase_uri is null when using the cocoon protocol. Is this correct?
Revision Changes Path
1.19 +13 -4
xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XIncludeTransformer.java 2001/10/18 17:23:59 1.18
+++ XIncludeTransformer.java 2001/10/19 11:44:55 1.19
@@ -41,7 +41,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.18 $ $Date: 2001/10/18 17:23:59 $ $Author: bloritsch $
+ * @version CVS $Revision: 1.19 $ $Date: 2001/10/19 11:44:55 $ $Author: morrijr $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable {
@@ -200,16 +200,25 @@
protected void processXIncludeElement(String href, String parse) throws
SAXException,ProcessingException,IOException {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Processing XInclude element: href="+href+",
parse="+parse);
- getLogger().debug("Base URI: " + current_xmlbase_uri.getSystemId());
+ if(current_xmlbase_uri == null)
+ getLogger().debug("Base URI: null");
+ else
+ getLogger().debug("Base URI: " + current_xmlbase_uri.getSystemId());
}
Source url;
String suffix;
int index = href.indexOf('#');
if (index < 0) {
- url = this.resolver.resolve(current_xmlbase_uri.getSystemId() + href);
+ if(current_xmlbase_uri == null)
+ url = this.resolver.resolve(href);
+ else
+ url = this.resolver.resolve(current_xmlbase_uri.getSystemId() +
href);
suffix = "";
} else {
- url = this.resolver.resolve(current_xmlbase_uri.getSystemId() +
href.substring(0,index));
+ if(current_xmlbase_uri == null)
+ url = this.resolver.resolve(href.substring(0,index));
+ else
+ url = this.resolver.resolve(current_xmlbase_uri.getSystemId() +
href.substring(0,index));
suffix = href.substring(index+1);
}
if (getLogger().isDebugEnabled()) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
