cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

[bruno]

bruno       2003/05/23 06:06:34

  Modified:    src/java/org/apache/cocoon/transformation
                        XIncludeTransformer.java
  Log:
  Decode xpointer expressions as required per XInclude spec.
  
  Revision  Changes    Path
  1.4       +3 -2      
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XIncludeTransformer.java  20 May 2003 20:49:57 -0000      1.3
  +++ XIncludeTransformer.java  23 May 2003 13:06:33 -0000      1.4
  @@ -59,6 +59,7 @@
   import org.apache.avalon.framework.CascadingException;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.ResourceNotFoundException;
  +import org.apache.cocoon.util.NetUtils;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.components.xpointer.XPointer;
  @@ -391,7 +392,7 @@
                       try {
                           if (suffix.length() > 0) {
                               XPointer xpointer;
  -                            xpointer = XPointerFrameworkParser.parse(suffix);
  +                            xpointer = 
XPointerFrameworkParser.parse(NetUtils.decodePath(suffix));
                               XPointerContext context = new 
XPointerContext(suffix, url, subPipe, getLogger(), manager);
                               xpointer.process(context);
                           } else {