cziegeler    2002/07/04 05:20:37

  Modified:    src/java/org/apache/cocoon/transformation
                        SourceWritingTransformer.java
  Log:
  Inserted correct next version number
  
  Revision  Changes    Path
  1.7       +9 -7      
xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
  
  Index: SourceWritingTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SourceWritingTransformer.java     1 Jul 2002 14:43:17 -0000       1.6
  +++ SourceWritingTransformer.java     4 Jul 2002 12:20:37 -0000       1.7
  @@ -608,7 +608,7 @@
                   ", replace="+replacePath+
                   ", create="+create+
                   ", overwrite="+overwrite+
  -                ", resinsert="+reinsertPath+
  +                ", reinsert="+reinsertPath+
                   ", fragment="+(fragment == null ? "null" : 
XMLUtils.serializeNodeToXML(fragment)));
           }
           // test parameter
  @@ -656,22 +656,24 @@
                           }
                           if (replaceNode != null) {
                               if (overwrite == true) {
  -                                                parent.replaceChild(importNode, 
replaceNode);
  -                                                                message += ", 
replacing: " + replacePath;
  +                                parent.replaceChild(importNode, replaceNode);
  +                                message += ", replacing: " + replacePath;
                                   if (reinsertPath != null) {
  -                                    Node insertAt = 
XMLUtil.getSingleNode(importNode, reinsertPath);
  +                                    Node insertAt = XMLUtil.getSingleNode(parent, 
reinsertPath);
  +                                    System.out.println("DOC: " + 
XMLUtils.serializeNodeToXML(parent));
  +                                    System.out.println("Path: " + reinsertPath);
                                       if (insertAt != null) {
                                           while (replaceNode.hasChildNodes() == true) 
{
                                               
insertAt.appendChild(replaceNode.getFirstChild());
                                           }
                                       } else { // reinsert point null
  -                                                                            message 
= "replace failed, could not find your reinsert path: " + reinsertPath;
  -                                                                            
resource = null;
  +                                        message = "replace failed, could not find 
your reinsert path: " + reinsertPath;
  +                                        resource = null;
                                       }
                                   }
                               } else { // overwrite was false
                                   message = "replace failed, no overwrite allowed.";
  -                                resource = null;/**/
  +                                resource = null;
                               }
                           } else { // specified replaceNode was not found
                               parent.appendChild(importNode);
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to