Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv9018/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterPublicationUtil.java NewsletterUtil.java
Log Message:
CMSC-811,Create a newsletter publication,deal with sending mail when empty and
newsletter is paused
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterPublicationUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterPublicationUtil.java 29 Apr 2008 06:09:02 -0000 1.20
+++ NewsletterPublicationUtil.java 30 Apr 2008 07:30:10 -0000 1.21
@@ -55,6 +55,13 @@
}
}
+ public static Node getNewsletterByPublicationNumber(int publicationNumber) {
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ Node newsletterPublicationNode = cloud.getNode(publicationNumber);
+ List<Node> relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
+ return relatedNewsletters.get(0);
+ }
+
public static Node createPublication(int newsletterNumber, boolean
copyContent) {
if (newsletterNumber > 0) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Index: NewsletterUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterUtil.java 29 Apr 2008 07:16:49 -0000 1.19
+++ NewsletterUtil.java 30 Apr 2008 07:30:10 -0000 1.20
@@ -1,6 +1,7 @@
package com.finalist.newsletter.util;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
@@ -386,14 +387,18 @@
if (number > 0) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Node newsletterNode = cloud.getNode(number);
+ return isPaused(newsletterNode);
+ }
+ return (false);
+ }
+ public static boolean isPaused(Node newsletterNode) {
if (newsletterNode != null) {
boolean isPaused = newsletterNode.getBooleanValue("paused");
- return (isPaused);
- }
+ Date now = new Date();
+ return (isPaused &&
now.after(newsletterNode.getDateValue("pausedstartdate")) &&
now.before(newsletterNode.getDateValue("pausedstopdate")));
}
return (false);
}
-
public static void pauseNewsletter(int number) {
if (number > 0) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
