[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl NewsletterPublicationCAOImpl.java NewsletterSubscriptionCAOImpl.java

[jruijter]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory 
james.mmbase.org:/tmp/cvs-serv19095/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl

Modified Files:
      Tag: b1_6
        NewsletterPublicationCAOImpl.java 
        NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-1378 publish subscriptions to staging from live


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-1378


Index: NewsletterPublicationCAOImpl.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -b -r1.31.2.1 -r1.31.2.2
--- NewsletterPublicationCAOImpl.java   10 Mar 2009 08:26:18 -0000      1.31.2.1
+++ NewsletterPublicationCAOImpl.java   15 Apr 2009 15:02:20 -0000      1.31.2.2
@@ -50,8 +50,8 @@
       query.setNodeStep(theStep);
 
       Field field = pubManager.getField("status");
-      Constraint titleConstraint = SearchUtil.createEqualConstraint(query, 
field, Publication.STATUS.READY.toString());
-      SearchUtil.addConstraint(query, titleConstraint);
+      Constraint statusConstraint = SearchUtil.createEqualConstraint(query, 
field, Publication.STATUS.READY.toString());
+      SearchUtil.addConstraint(query, statusConstraint);
 
       List<Node> pubNodes = query.getList();
 


Index: NewsletterSubscriptionCAOImpl.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -b -r1.37.2.1 -r1.37.2.2
--- NewsletterSubscriptionCAOImpl.java  3 Apr 2009 09:32:39 -0000       1.37.2.1
+++ NewsletterSubscriptionCAOImpl.java  15 Apr 2009 15:02:20 -0000      1.37.2.2
@@ -32,7 +32,9 @@
 import com.finalist.cmsc.beans.MMBaseNodeMapper;
 import com.finalist.cmsc.paging.PagingStatusHolder;
 import com.finalist.cmsc.paging.PagingUtils;
+import com.finalist.cmsc.services.publish.Publish;
 import com.finalist.cmsc.util.DateUtil;
+import com.finalist.cmsc.util.ServerUtil;
 import com.finalist.newsletter.cao.AbstractCAO;
 import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
 import com.finalist.newsletter.domain.Newsletter;
@@ -86,6 +88,11 @@
       Node newsletternode = cloud.getNode(nodeNumber);
       RelationManager insrel = cloud.getRelationManager("subscriptionrecord", 
"newsletter", "newslettered");
       subscriptionrecordNode.createRelation(newsletternode, insrel).commit();
+      
+      if (ServerUtil.isLive()) {
+          Publish.publish(subscriptionrecordNode);
+      }
+      
       subscription.setId(subscriptionrecordNode.getNumber());
    }
 
@@ -456,8 +463,10 @@
       SearchUtil.addEqualConstraint(query, 
recordManager.getField("subscriber"), String.valueOf(anthId));
       List<Node> subscriptions = query.getList();
       for (Node subscription : subscriptions) {
-         subscription.deleteRelations();
-         subscription.delete();
+         if (ServerUtil.isLive()) {
+             Publish.unpublish(subscription);
+         }
+         subscription.delete(true);       
       }
    }
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs