lenya/src/java/org/apache/lenya/cms/publication DefaultSiteTree.java,1.7,1.8

Update of /repository/lenya/src/java/org/apache/lenya/cms/publication
In directory erbium:/tmp/cvs-serv30412/src/java/org/apache/lenya/cms/publication

Modified Files:
	DefaultSiteTree.java 
Log Message:
The check whether a node already exists did not work. Using the new
method getAbsoluteParentId it is fixed now.


Index: DefaultSiteTree.java
===================================================================
RCS file: /repository/lenya/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DefaultSiteTree.java	14 May 2003 13:57:06 -0000	1.7
--- DefaultSiteTree.java	14 May 2003 16:33:01 -0000	1.8
***************
*** 136,140 ****
      public void addNode(SiteTreeNode node)
  	throws SiteTreeException {
! 	this.addNode(node.getParentId(), node.getId(), node.getLabels(),
  		     node.getHref(), node.getSuffix(), node.hasLink());
      }
--- 136,140 ----
      public void addNode(SiteTreeNode node)
  	throws SiteTreeException {
! 	this.addNode(node.getAbsoluteParentId(), node.getId(), node.getLabels(),
  		     node.getHref(), node.getSuffix(), node.hasLink());
      }
***************
*** 152,158 ****
  	
          // Check if child already exists
!         Node childNode = getNodeInternal(id); 
          if (childNode != null) {
!           log.info("This node (id = "+ id +") was already insert");
            return;
          }          
--- 152,158 ----
  	
          // Check if child already exists
!         Node childNode = getNodeInternal(parentid + "/" + id); 
          if (childNode != null) {
!           log.info("This node: " + parentid + "/" + id + " has already been inserted");
            return;
          }