Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv18884/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
Tag: b1_5
NewsletterSubscriptionCAOImpl.java
NewsletterPublicationCAOImpl.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: NewsletterSubscriptionCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.30.2.5
retrieving revision 1.30.2.6
diff -u -b -r1.30.2.5 -r1.30.2.6
--- NewsletterSubscriptionCAOImpl.java 3 Apr 2009 09:23:12 -0000 1.30.2.5
+++ NewsletterSubscriptionCAOImpl.java 15 Apr 2009 14:56:04 -0000 1.30.2.6
@@ -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);
}
}
}
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.24.2.5
retrieving revision 1.24.2.6
diff -u -b -r1.24.2.5 -r1.24.2.6
--- NewsletterPublicationCAOImpl.java 10 Mar 2009 08:24:25 -0000 1.24.2.5
+++ NewsletterPublicationCAOImpl.java 15 Apr 2009 14:56:04 -0000 1.24.2.6
@@ -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();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
