Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv28048/src/java/com/finalist/newsletter
Modified Files:
NewsletterCronJob.java
Log Message:
CMSC-811 auto create publication,clone attachment when add publication
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterCronJob.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/NewsletterCronJob.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterCronJob.java 30 Apr 2008 07:30:10 -0000 1.13
+++ NewsletterCronJob.java 4 May 2008 12:02:12 -0000 1.14
@@ -39,7 +39,9 @@
List<Node> newslettersToPublish = new ArrayList<Node>();
for (int i = 0; i < newsletters.size(); i++) {
Node newsletter = newsletters.getNode(i);
- if (NewsletterUtil.isPaused(newsletter)) {
+ boolean isPaused = NewsletterUtil.isPaused(newsletter);
+ System.out.println("------------>"+isPaused);
+ if (isPaused) {
continue;
}
if (!Publish.isPublished(newsletter)) {
@@ -105,12 +107,16 @@
}
else if(expressions[4].equals("2")) {
int interval = Integer.parseInt(expressions[5]);
+
System.out.println("-----------------------111>"+lastCreatedDateTime);
if(lastCreatedDateTime == null ||
DateUtils.isSameDay(minDate, lastCreatedDateTime)) {
+
System.out.println("-----------------------222>"+lastCreatedDateTime);
if(DateUtils.isSameDay(DateUtils.addDays(startDate,
interval),now)) {
+
System.out.println("-----------------------333>"+interval);
isPublish = true;
}
}
else {
+
System.out.println("-----------------------444>111111111");
if(DateUtils.isSameDay(DateUtils.addDays(lastCreatedDateTime, interval),now)) {
isPublish = true;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
