Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory james.mmbase.org:/tmp/cvs-serv19157
Modified Files:
Tag: b1_6
RepositoryUtil.java
Log Message:
CMSC-1298 Clone channel feature
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1298
Index: RepositoryUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -u -b -r1.36.2.4 -r1.36.2.5
--- RepositoryUtil.java 20 Mar 2009 08:22:57 -0000 1.36.2.4
+++ RepositoryUtil.java 20 Mar 2009 10:12:55 -0000 1.36.2.5
@@ -1242,7 +1242,6 @@
Node newNode =
copyChannel(sourceChannel,destChannel,channelList,copiedNodes,output);
output.append("<br/><br/>copiedNodes has #" + copiedNodes.size() +
":<br/>" + copiedNodes.toString());
-
if(log.isDebugEnabled()) {
log.debug("#################:"+output.toString());
}
@@ -1477,10 +1476,6 @@
continue;
}
- if (!isChannel(rel.getDestination()) &&
!isRelatedWithCurrentChannelTree(rel.getDestination(),channels)) {
- output.append("skipped " + relManager.getName() + "; ");
- continue; //Skip nodes not in the current channel tree.
- }
if (isChannel(rel.getDestination()) ||
relManager.getName().equalsIgnoreCase("deletionrel")
// || relManager.getName().equalsIgnoreCase("creationrel")
@@ -1491,7 +1486,12 @@
else if
(rel.getNodeManager().getName().equals(ContentElementUtil.OWNERREL)) {
CloneUtil.cloneRelations(sourceNode, destNode,
ContentElementUtil.OWNERREL, SecurityUtil.USER);
output.append(ContentElementUtil.OWNERREL + " copied;");
- } else
+ }
+ else if
(!isRelatedWithCurrentChannelTree(rel.getDestination(),channels)) {
+ output.append("skipped " + relManager.getName() + "; ");
+ continue; //Skip nodes not in the current channel tree.
+ }
+ else
{
//*** Start cloning the node from sourceChild -> destChild
//If the related node should be cloned, dive into the node and
deepcopy it
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
