Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv12857/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
Tag: b1_5
NewsletterPublicationServiceImpl.java
Log Message:
CMSC-1153 - Newsletter: Generic improvements on code, by removing casts and
improving translations.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-1153
Index: NewsletterPublicationServiceImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.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
--- NewsletterPublicationServiceImpl.java 10 Dec 2008 02:35:25 -0000
1.24.2.5
+++ NewsletterPublicationServiceImpl.java 18 Dec 2008 13:29:47 -0000
1.24.2.6
@@ -8,6 +8,10 @@
import java.util.Map;
import java.util.Set;
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -58,7 +62,7 @@
/**
* deliver all READY publications in the system
*/
- public void deliverAllPublication() {
+ public void deliverAllPublications() {
log.info("starting deliver all publications in READY status");
List<Integer> publications = publicationCAO.getIntimePublicationIds();
@@ -83,15 +87,15 @@
Map<String, List<String>> sendResults = new HashMap<String,
List<String>>();
List<Subscription> subscriptions =
subscriptionCAO.getSubscription(newsletterId);
log.debug("deliver publication " + publicationId + " which has " +
subscriptions.size() + " subscriptions");
- NewsletterPublicationUtil.setBeingSent(publicationId);
+ NewsletterPublicationUtil.setBeingSend(publicationId);
Publication publication = publicationCAO.getPublication(publicationId);
for (Subscription subscription : subscriptions) {
Set<Term> terms = subscriptionCAO.getTerms(subscription.getId());
- Person subscripber =
CommunityModuleAdapter.getUserById(subscription.getSubscriberId());
- if(subscripber == null ||
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(subscripber.getActive())) {
+ Person subscriber =
CommunityModuleAdapter.getUserById(subscription.getSubscriberId());
+ if(subscriber == null ||
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(subscriber.getActive())) {
continue;
}
- subscription.setEmail(subscripber.getEmail());
+ subscription.setEmail(subscriber.getEmail());
subscription.setTerms(terms);
try {
publisher.deliver(publication, subscription);
@@ -101,7 +105,9 @@
log.error(e.getMessage());
}
}
- NewsletterPublicationUtil.setIsSent(publicationId);
+ Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
+ Node edition = cloud.getNode(publicationId);
+ NewsletterPublicationUtil.setIsSent(edition);
sendResults.put(SEND_SUCCESS, sendSuccess);
sendResults.put(SEND_FAIL, sendFails);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
