cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding InsertNodeJXPathBindingBuilder.java

[bruno]

bruno       2003/09/05 03:41:27

  Modified:    src/blocks/woody/java/org/apache/cocoon/woody/binding
                        InsertNodeJXPathBindingBuilder.java
  Log:
  Support using an xpath attribute on the wb:insert-node element
  
  Revision  Changes    Path
  1.4       +26 -12    
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBindingBuilder.java
  
  Index: InsertNodeJXPathBindingBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/InsertNodeJXPathBindingBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InsertNodeJXPathBindingBuilder.java       12 Aug 2003 15:39:15 -0000      
1.3
  +++ InsertNodeJXPathBindingBuilder.java       5 Sep 2003 10:41:27 -0000       
1.4
  @@ -50,24 +50,22 @@
   */
   package org.apache.cocoon.woody.binding;
   
  -import org.w3c.dom.DocumentFragment;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.NodeList;
  -import org.w3c.dom.Document;
  +import org.w3c.dom.*;
   import org.apache.cocoon.woody.util.DomHelper;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.excalibur.source.SourceResolver;
   import org.apache.excalibur.source.Source;
  +import org.apache.excalibur.xml.xpath.XPathProcessor;
   
   /**
  - * InsertNodeJXPathBindingBuilder provides a helper class for the Factory 
  - * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps 
construct the 
  - * actual [EMAIL PROTECTED] InsertNodeJXPathBinding} out of the 
configuration in the 
  + * InsertNodeJXPathBindingBuilder provides a helper class for the Factory
  + * implemented in [EMAIL PROTECTED] JXPathBindingManager} that helps 
construct the
  + * actual [EMAIL PROTECTED] InsertNodeJXPathBinding} out of the 
configuration in the
    * provided configElement which looks like:
    * <pre><code>
    * &lt;wb:insert-node&gt;
  - *   &lt;!-- in here comes a template that will be inserted in the target 
  + *   &lt;!-- in here comes a template that will be inserted in the target
    *           document --&gt;
    * &lt;/wb:insert-node&gt;
    * </code></pre>
  @@ -76,13 +74,13 @@
       extends JXpathBindingBuilderBase {
   
       /**
  -     * Creates an instance of [EMAIL PROTECTED] InsertNodeJXPathBinding} 
configured 
  -     * with the nested template of the bindingElm. 
  +     * Creates an instance of [EMAIL PROTECTED] InsertNodeJXPathBinding} 
configured
  +     * with the nested template of the bindingElm.
        */
       public JXPathBindingBase buildBinding(
           Element bindingElm,
           JXPathBindingManager.Assistant assistant) throws BindingException {
  -            
  +
           try {
               DocumentFragment domTemplate = null;
   
  @@ -94,8 +92,24 @@
                   try {
                       source = sourceResolver.resolveURI(src);
                       Document document = SourceUtil.toDOM(source);
  +                    Element element = document.getDocumentElement();
  +
  +                    String xpath = bindingElm.getAttribute("xpath");
  +                    if (!xpath.equals("")) {
  +                        XPathProcessor xpathProcessor = 
(XPathProcessor)manager.lookup(XPathProcessor.ROLE);
  +                        try {
  +                            Node node = 
xpathProcessor.selectSingleNode(document, xpath);
  +                            if (node == null)
  +                                throw new BindingException("XPath expression 
\"" + xpath + "\" didn't return a result.");
  +                            if (!(node instanceof Element))
  +                                throw new BindingException("XPath expression 
\"" + xpath + "\" did not return an element node.");
  +                            element = (Element)node;
  +                        } finally {
  +                            manager.release(xpathProcessor);
  +                        }
  +                    }
                       domTemplate = document.createDocumentFragment();
  -                    domTemplate.appendChild(document.getDocumentElement());
  +                    domTemplate.appendChild(element);
                   } finally {
                       if (source != null)
                           sourceResolver.release(source);