Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory james.mmbase.org:/tmp/cvs-serv21496/publisher
Modified Files:
NewsletterPublisher.java
Log Message:
CMSC-743,Newsletter:send email
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-743
Index: NewsletterPublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterPublisher.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NewsletterPublisher.java 20 May 2008 05:09:21 -0000 1.26
+++ NewsletterPublisher.java 20 May 2008 09:49:52 -0000 1.27
@@ -42,7 +42,8 @@
import com.finalist.newsletter.publisher.cache.CacheFactory;
import com.finalist.newsletter.publisher.cache.ICache;
import com.finalist.newsletter.util.NewsletterUtil;
-
+import com.finalist.newsletter.domain.Term;
+import java.util.Set;
public class NewsletterPublisher {
private static Logger log = Logging
@@ -149,6 +150,7 @@
private String getBody(Publication publication, Subscription subscription)
throws MessagingException {
+
String url = NewsletterUtil.getTermURL(publication.getUrl(), subscription
.getTerms(), publication.getId());
ICache cache = null;
@@ -160,7 +162,7 @@
cache = CacheFactory.getDefaultCache(Long.parseLong(expiration));
}
String content = " ";
- if (!cache.contains(url)) {
+ if ((subscription.getTerms() == null) || (subscription.getTerms().size()
== 0) || !cache.contains(url)) {
int articleCounts =
NewsletterUtil.countArticlesByNewsletter(publication.getNewsletterId());
if (articleCounts == 0&&publication.getNewsletter().getSendempty()) {
content = publication.getNewsletter().getTxtempty();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
