Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory
james.mmbase.org:/tmp/cvs-serv9018/src/java/com/finalist/newsletter/publisher
Modified Files:
NewsletterPublisher.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/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterPublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- NewsletterPublisher.java 29 Apr 2008 08:58:19 -0000 1.21
+++ NewsletterPublisher.java 30 Apr 2008 07:30:10 -0000 1.22
@@ -47,7 +47,7 @@
setRecipient(message, subscription.getEmail());
setBody(publication, subscription, message);
- setTitle(message, publication.getTitle());
+ setTitle(message, publication.getNewsletter().getTitle());
setMIME(message, subscription.getMimeType());
Transport.send(message);
@@ -63,7 +63,16 @@
private void setBody(Publication publication, Subscription subscription,
Message message) throws MessagingException {
String url =
NewsletterUtil.getTermURL(publication.getUrl(),subscription.getTerms(),publication.getId());
- String content = NewsletterGenerator.generate(url,
subscription.getMimeType());
+ int articleCounts =
NewsletterUtil.countArticlesByNewsletter(publication.getNewsletterId());
+ String content = " ";
+ if(articleCounts == 0) {
+ if(publication.getNewsletter().getSendempty()) {
+ content = publication.getNewsletter().getTxtempty();
+ }
+ }
+ else {
+ content = NewsletterGenerator.generate(url,
subscription.getMimeType());
+ }
if (null != getPersonalise()) {
content = getPersonalise().personalise(content, subscription,
publication);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
