[MMBASE CVS] contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans CreateRelationsForSecondaryContent.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans
In directory james.mmbase.org:/tmp/cvs-serv2519

Modified Files:
        CreateRelationsForSecondaryContent.java 
Log Message:
CMSC-1192 Assets: add SQL script to migrate all images/attachments/URLs to new 
assetstable


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-1192


Index: CreateRelationsForSecondaryContent.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/maintenance/src/java/com/finalist/cmsc/maintenance/beans/CreateRelationsForSecondaryContent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CreateRelationsForSecondaryContent.java     24 Dec 2008 13:17:43 -0000      
1.6
+++ CreateRelationsForSecondaryContent.java     24 Dec 2008 13:19:36 -0000      
1.7
@@ -8,6 +8,7 @@
 import org.mmbase.bridge.Relation;
 
 import com.finalist.cmsc.mmbase.RelationUtil;
+import com.finalist.cmsc.navigation.ServerUtil;
 import com.finalist.cmsc.repository.RepositoryUtil;
 import com.finalist.cmsc.security.SecurityUtil;
 import com.finalist.cmsc.services.publish.Publish;
@@ -50,6 +51,7 @@
          Node asset = assets.getNode(i);
          if (!RepositoryUtil.hasCreationChannel(asset)) {
             Relation relation = RelationUtil.createRelation(asset, root, 
"creationrel");
+            if(ServerUtil.isStaging() && !ServerUtil.isSingle()) {
             if(Publish.isPublished(asset) && Publish.isPublishable(relation)) {
                Publish.publish(relation);
             }
@@ -62,14 +64,17 @@
                }
             }
          }
+         }
          int owners = asset.countRelatedNodes(ownerManager, "ownerrel", 
"destination");
          if (owners < 1) {  
             Relation relation = RelationUtil.createRelation(asset, user, 
"ownerrel");
+            if(ServerUtil.isStaging() && !ServerUtil.isSingle()) {
             if(Publish.isPublished(asset) && Publish.isPublishable(relation)) {
                Publish.publish(relation);
             }
          }
       }
+      }
       
    }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs