Update of
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
In directory james.mmbase.org:/tmp/cvs-serv1286
Modified Files:
CreateRelationsForSecondaryContent.java
Log Message:
CMSC-1206 Asset: enhance the create-relations-asset-channel.jsp script to
find a good channel add version for Asset
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
See also: http://www.mmbase.org/jira/browse/CMSC-1206
Index: CreateRelationsForSecondaryContent.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans/CreateRelationsForSecondaryContent.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- CreateRelationsForSecondaryContent.java 26 Dec 2008 09:36:04 -0000
1.10
+++ CreateRelationsForSecondaryContent.java 30 Dec 2008 02:25:55 -0000
1.11
@@ -14,6 +14,8 @@
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.cmsc.services.versioning.Versioning;
+import com.finalist.cmsc.services.versioning.VersioningException;
public class CreateRelationsForSecondaryContent {
@@ -74,19 +76,30 @@
Node channel = getRelatedChannel(asset);
if(channel == null) {
+ log.info("Assets - begin to add relation from " +
asset.getNumber()+" to channel " +root.getNumber()+ " Asset elements.");
relation = RelationUtil.createRelation(asset, root,
CREATIONREL);
}
else {
+ log.info("Assets - begin to add relation from " +
asset.getNumber()+" to channel " +channel.getNumber()+ " Asset elements.");
relation = RelationUtil.createRelation(asset, channel,
CREATIONREL);
+ log.info("Assets - added relations to Asset element."+
asset.getNumber());
}
}
else {
- relation = RelationUtil.createRelation(asset, root,
"creationrel");
+ log.info("Assets - begin to add relation from " +
asset.getNumber()+" to channel " +root.getNumber()+ " Asset elements.");
+ relation = RelationUtil.createRelation(asset, root,
CREATIONREL);
}
Publish.publish(relation); // This method checks if it need to
publish
// otherwise, it doesn't harm anyone
}
+ //Add a version for a asset element.
+ try {
+ Versioning.addVersion(asset);
+ }
+ catch (VersioningException e) {
+ log.error("Add version error for node"+asset.getNumber(),e);
+ }
/*int owners = asset.countRelatedNodes(ownerManager, "ownerrel",
"destination");
if (owners < 1) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs