Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv12453/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsLetterStatisticCAOImpl.java NewsletterCAOImpl.java
NewsletterPublicationCAOImpl.java
NewsletterSubscriptionCAOImpl.java
Log Message:
CMSC-1085 Newsletter publication should be emailed from Live environment
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-1085
Index: NewsLetterStatisticCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsLetterStatisticCAOImpl.java 27 Oct 2008 05:56:30 -0000 1.19
+++ NewsLetterStatisticCAOImpl.java 28 Oct 2008 11:13:36 -0000 1.20
@@ -6,8 +6,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
import org.apache.commons.lang.time.DateUtils;
+import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.NodeManager;
@@ -23,31 +23,33 @@
import org.mmbase.storage.search.implementation.BasicFieldValueConstraint;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-
-import com.finalist.newsletter.cao.AbstractCAO;
import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.util.StatisticUtil;
import com.finalist.newsletter.domain.StatisticResult;
import com.finalist.newsletter.domain.StatisticResult.HANDLE;
-public class NewsLetterStatisticCAOImpl extends AbstractCAO implements
NewsLetterStatisticCAO {
-
+public class NewsLetterStatisticCAOImpl implements NewsLetterStatisticCAO {
+ private Cloud cloud;
private static Logger log =
Logging.getLoggerInstance(NewsLetterStatisticCAOImpl.class.getName());
- public List<StatisticResult> getAllRecords() {
+ public void setCloud(Cloud cloud) {
+ this.cloud = cloud;
+ }
+
+ public List < StatisticResult > getAllRecords() {
- NodeQuery query = getCloud().createNodeQuery();
- Step step =
query.addStep(getCloud().getNodeManager("newsletterdailylog"));
+ NodeQuery query = cloud.createNodeQuery();
+ Step step = query.addStep(cloud.getNodeManager("newsletterdailylog"));
query.setNodeStep(step);
NodeList list = query.getList();
StatisticUtil util = new StatisticUtil();
return util.convertFromNodeList(list);
}
- public List<StatisticResult> getRecordsByNewsletter(int newsletter) {
- NodeQuery query = getCloud().createNodeQuery();
- NodeManager manager = getCloud().getNodeManager("newsletterdailylog");
+ public List < StatisticResult > getRecordsByNewsletter(int newsletter) {
+ NodeQuery query = cloud.createNodeQuery();
+ NodeManager manager = cloud.getNodeManager("newsletterdailylog");
Step step1 = query.addStep(manager);
StepField field1 = query.addField(step1, manager.getField("newsletter"));
query.addField(step1, manager.getField("subscribe"));
@@ -64,9 +66,9 @@
return util.convertFromNodeList(list);
}
- public List<StatisticResult> getAllRecordsByPeriod(Date start, Date end) {
- NodeQuery query = getCloud().createNodeQuery();
- NodeManager manager = getCloud().getNodeManager("newsletterdailylog");
+ public List < StatisticResult > getAllRecordsByPeriod(Date start, Date end)
{
+ NodeQuery query = cloud.createNodeQuery();
+ NodeManager manager = cloud.getNodeManager("newsletterdailylog");
Step step1 = query.addStep(manager);
query.addField(step1, manager.getField("subscribe"));
query.addField(step1, manager.getField("post"));
@@ -86,14 +88,14 @@
/**
* @return List which sumLogs about StatisticResult
*/
- public List<StatisticResult> getLogs() {
+ public List < StatisticResult > getLogs() {
NodeList nodelist = getNodelist();
synchronized (this) {
- List<StatisticResult> logsList = new ArrayList<StatisticResult>();
- List<StatisticResult> resultList = getLogsByNode(nodelist);
+ List < StatisticResult > logsList = new ArrayList < StatisticResult
>();
+ List < StatisticResult > resultList = getLogsByNode(nodelist);
if (null != resultList) {
// use newsletterId and userId as key to take the logic
- Map<String, StatisticResult> sumedMap = new HashMap<String,
StatisticResult>();
+ Map < String , StatisticResult > sumedMap = new HashMap < String ,
StatisticResult >();
for (StatisticResult r : resultList) {
String uniteKey = r.getNewsletterId() + "H" + r.getUserId();
StatisticResult freq = (StatisticResult) sumedMap.get(uniteKey);
@@ -141,8 +143,8 @@
Date now = new Date();
Date startDate = DateUtils.addHours(now, -23);
Date endDate = DateUtils.addDays(now, 0);
- NodeQuery query = getCloud().createNodeQuery();
- NodeManager manager = getCloud().getNodeManager("newsletterdailylog");
+ NodeQuery query = cloud.createNodeQuery();
+ NodeManager manager = cloud.getNodeManager("newsletterdailylog");
Step step = query.addStep(manager);
StepField field = query.addField(step, manager.getField("logdate"));
StepField field1 = query.addField(step, manager.getField("post"));
@@ -163,7 +165,7 @@
return list;
}
- private List<StatisticResult> getLogsByNode(NodeList list) {
+ private List < StatisticResult > getLogsByNode(NodeList list) {
StatisticUtil util = new StatisticUtil();
return util.convertFromNodeList(list);
}
@@ -182,9 +184,9 @@
}
- public List<StatisticResult> getRecordsByNewsletterAndPeriod(Date start,
Date end, int newsletter) {
- NodeQuery query = getCloud().createNodeQuery();
- NodeManager manager = getCloud().getNodeManager("newsletterdailylog");
+ public List < StatisticResult > getRecordsByNewsletterAndPeriod(Date start,
Date end, int newsletter) {
+ NodeQuery query = cloud.createNodeQuery();
+ NodeManager manager = cloud.getNodeManager("newsletterdailylog");
Step step1 = query.addStep(manager);
query.addField(step1, manager.getField("subscribe"));
query.addField(step1, manager.getField("post"));
@@ -200,7 +202,7 @@
constraints.addChild(constraint2);
query.setConstraint(constraints);
query.setNodeStep(step1);
- List<Node> list = query.getList();
+ List < Node > list = query.getList();
StatisticUtil util = new StatisticUtil();
return util.convertFromNodeList((NodeList) list);
}
@@ -218,8 +220,8 @@
logNode.setDateValue("logdate", new Date());
logNode.commit();
} else {
- NodeManager logManager =
getCloud().getNodeManager("newsletterdailylog");
- // Node newsletter = getRemoteCloud().getNode(newsletterId);
+ NodeManager logManager = cloud.getNodeManager("newsletterdailylog");
+ // Node newsletter = cloud.getNode(newsletterId);
logNode = logManager.createNode();
logNode.setIntValue("newsletter", newsletterId);
logNode.setIntValue("post", 0);
@@ -252,8 +254,8 @@
}
boolean isLog = false;
- NodeManager logNodeManager =
getCloud().getNodeManager("newsletterdailylog");
- NodeQuery query = getCloud().createNodeQuery();
+ NodeManager logNodeManager = cloud.getNodeManager("newsletterdailylog");
+ NodeQuery query = cloud.createNodeQuery();
Step parameterStep = query.addStep(logNodeManager);
query.setNodeStep(parameterStep);
Queries.addSortOrders(query, "logdate", "DOWN");
@@ -282,9 +284,9 @@
public Node getLogNode(int userId, int newsletterId) {
log.info("-------------------logPubliction -in
process...getLogNode....: ");
- NodeManager logNodeManager =
getCloud().getNodeManager("newsletterdailylog");
+ NodeManager logNodeManager = cloud.getNodeManager("newsletterdailylog");
Node logNode = null;
- NodeQuery query = getCloud().createNodeQuery();
+ NodeQuery query = cloud.createNodeQuery();
Step parameterStep = query.addStep(logNodeManager);
query.setNodeStep(parameterStep);
Queries.addSortOrders(query, "logdate", "DOWN");
@@ -307,9 +309,9 @@
* @param listRecorder which get from data
* @return how many SumedLogs insert
*/
- public int insertSumedLogs(List<StatisticResult> logsList) {
+ public int insertSumedLogs(List < StatisticResult > logsList) {
int i = 0;
- NodeManager logManager = getCloud().getNodeManager("newsletterdailylog");
+ NodeManager logManager = cloud.getNodeManager("newsletterdailylog");
Node logNode;
Date now = new Date();
Date start = DateUtils.addHours(now, -12);
Index: NewsletterCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterCAOImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NewsletterCAOImpl.java 27 Oct 2008 05:56:30 -0000 1.26
+++ NewsletterCAOImpl.java 28 Oct 2008 11:13:36 -0000 1.27
@@ -32,18 +32,17 @@
}
public List<Term> getALLTerm() {
- NodeQuery query = getCloud().createNodeQuery();
- Step step = query.addStep(getCloud().getNodeManager("term"));
+ NodeQuery query = cloud.createNodeQuery();
+ Step step = query.addStep(cloud.getNodeManager("term"));
query.setNodeStep(step);
NodeList list = query.getList();
return MMBaseNodeMapper.convertList(list, Term.class);
}
- public List<Newsletter> getNewsletterByConstraint(String property, String
constraintType, String value,
- boolean paging) {
+ public List<Newsletter> getNewsletterByConstraint(String property, String
constraintType, String value, boolean paging) {
PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
- NodeQuery query = getCloud().createNodeQuery();
- NodeManager nodeManager = getCloud().getNodeManager("newsletter");
+ NodeQuery query = cloud.createNodeQuery();
+ NodeManager nodeManager = cloud.getNodeManager("newsletter");
Step step = query.addStep(nodeManager);
query.setNodeStep(step);
if (StringUtils.isNotBlank(property)) {
@@ -51,23 +50,20 @@
SearchUtil.addLikeConstraint(query,
nodeManager.getField(property), value);
}
}
- if (pagingHolder != null &&
nodeManager.hasField(pagingHolder.getSort())) {
- Queries.addSortOrders(query, pagingHolder.getSort(),
pagingHolder.getMMBaseDirection());
- } else if (null != pagingHolder.getSort()) {
- paging = false;
- }
if (paging) {
query.setMaxNumber(pagingHolder.getPageSize());
query.setOffset(pagingHolder.getOffset());
}
-
+ if (pagingHolder != null) {
+ Queries.addSortOrders(query, pagingHolder.getSort(),
pagingHolder.getMMBaseDirection());
+ }
NodeList list = query.getList();
return MMBaseNodeMapper.convertList(list, Newsletter.class);
}
public int getNewsletterIdBySubscription(int id) {
log.debug("Get newsletter by subsription " + id);
- Node subscriptionNode = getCloud().getNode(id);
+ Node subscriptionNode = cloud.getNode(id);
NodeList nodes = subscriptionNode.getRelatedNodes("newsletter");
if (nodes.size() > 0) {
@@ -78,11 +74,11 @@
}
public Node getNewsletterNodeById(int newsletterId) {
- return getCloud().getNode(newsletterId);
+ return cloud.getNode(newsletterId);
}
public Newsletter getNewsletterById(int id) {
- Node newsletterNode = getCloud().getNode(id);
+ Node newsletterNode = cloud.getNode(id);
Newsletter newsletter = convertFromNode(newsletterNode);
NodeList terms = newsletterNode.getRelatedNodes("term");
@@ -107,14 +103,13 @@
public List<Term> getNewsletterTermsByName(int newsletterId, String name,
boolean paging) {
PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
- NodeManager termNodeManager = getCloud().getNodeManager("term");
- NodeManager newsletterNodeManager =
getCloud().getNodeManager("newsletter");
+ NodeManager termNodeManager = cloud.getNodeManager("term");
+ NodeManager newsletterNodeManager = cloud.getNodeManager("newsletter");
- NodeQuery query = getCloud().createNodeQuery();
+ NodeQuery query = cloud.createNodeQuery();
Step newsletterStep = query.addStep(newsletterNodeManager);
query.setNodeStep(newsletterStep);
- Constraint idConstraint = SearchUtil.createEqualConstraint(query,
newsletterNodeManager.getField("number"),
- newsletterId);
+ Constraint idConstraint = SearchUtil.createEqualConstraint(query,
newsletterNodeManager.getField("number"), newsletterId);
SearchUtil.addConstraint(query, idConstraint);
RelationStep relationStep = query.addRelationStep(termNodeManager,
"posrel", "destination");
@@ -143,7 +138,7 @@
}
public void processBouncesOfPublication(String publicationId, String
userId, String bounceContent) {
- NodeManager bounceManager =
getCloud().getNodeManager("newsletterbounce");
+ NodeManager bounceManager = cloud.getNodeManager("newsletterbounce");
Node node = bounceManager.createNode();
if (StringUtils.isNotEmpty(publicationId)) {
node.setIntValue("newsletter", Integer.parseInt(publicationId));
Index: NewsletterPublicationCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NewsletterPublicationCAOImpl.java 27 Oct 2008 05:56:30 -0000 1.26
+++ NewsletterPublicationCAOImpl.java 28 Oct 2008 11:13:36 -0000 1.27
@@ -1,31 +1,9 @@
package com.finalist.newsletter.cao.impl;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateFormatUtils;
-import org.mmbase.bridge.Field;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.Constraint;
-import org.mmbase.storage.search.Step;
-import org.mmbase.util.logging.Logger;
-import org.mmbase.util.logging.Logging;
-
import com.finalist.cmsc.beans.MMBaseNodeMapper;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.paging.PagingStatusHolder;
import com.finalist.cmsc.paging.PagingUtils;
-import com.finalist.newsletter.cao.AbstractCAO;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
import com.finalist.newsletter.domain.Newsletter;
import com.finalist.newsletter.domain.Publication;
@@ -33,15 +11,33 @@
import com.finalist.newsletter.util.NewsletterUtil;
import com.finalist.newsletter.util.POConvertUtils;
-public class NewsletterPublicationCAOImpl extends AbstractCAO implements
NewsletterPublicationCAO {
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.mmbase.bridge.*;
+import org.mmbase.bridge.util.Queries;
+import org.mmbase.bridge.util.SearchUtil;
+import org.mmbase.storage.search.Constraint;
+import org.mmbase.storage.search.Step;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
+
+import java.util.*;
+
+public class NewsletterPublicationCAOImpl implements NewsletterPublicationCAO {
private static Logger log =
Logging.getLoggerInstance(NewsletterPublicationCAOImpl.class.getName());
+ Cloud cloud;
+
+ public void setCloud(Cloud cloud) {
+ this.cloud = cloud;
+ }
+
public List<Integer> getIntimePublicationIds() {
- NodeQuery query = getCloud().createNodeQuery();
+ NodeQuery query = cloud.createNodeQuery();
- NodeManager pubManager =
getCloud().getNodeManager("newsletterpublication");
+ NodeManager pubManager = cloud.getNodeManager("newsletterpublication");
Step theStep = query.addStep(pubManager);
query.setNodeStep(theStep);
@@ -60,13 +56,13 @@
}
public void setStatus(int publicationId, Publication.STATUS status) {
- Node publicationNode = getCloud().getNode(publicationId);
+ Node publicationNode = cloud.getNode(publicationId);
publicationNode.setStringValue("status", status.toString());
publicationNode.commit();
}
public Publication getPublication(int number) {
- Node newsletterPublicationNode = getCloud().getNode(number);
+ Node newsletterPublicationNode = cloud.getNode(number);
List<Node> relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
log.debug("Get " + relatedNewsletters.size() + " related newsletter");
@@ -88,19 +84,19 @@
}
public Node getPublicationNode(int number) {
- return getCloud().getNode(number);
+ return cloud.getNode(number);
}
public String getPublicationURL(int publciationId) {
- Node publicationNode = getCloud().getNode(publciationId);
+ Node publicationNode = cloud.getNode(publciationId);
String hostUrl = NewsletterUtil.getServerURL();
String newsletterPath = getNewsletterPath(publicationNode);
return "".concat(hostUrl).concat(newsletterPath);
}
public int getNewsletterId(int publicationId) {
- Node newsletterPublicationNode = getCloud().getNode(publicationId);
+ Node newsletterPublicationNode = cloud.getNode(publicationId);
NodeList relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
log.debug("Get " + relatedNewsletters.size() + " related newsletter");
@@ -109,15 +105,15 @@
}
public List<Publication> getAllPublications() {
- NodeQuery query = getCloud().createNodeQuery();
- Step step =
query.addStep(getCloud().getNodeManager("newsletterpublication"));
+ NodeQuery query = cloud.createNodeQuery();
+ Step step = query.addStep(cloud.getNodeManager("newsletterpublication"));
query.setNodeStep(step);
NodeList list = query.getList();
return MMBaseNodeMapper.convertList(list, Publication.class);
}
public List<Publication> getPublicationsByNewsletter(int id,
Publication.STATUS status) {
- Node newsletterNode = getCloud().getNode(id);
+ Node newsletterNode = cloud.getNode(id);
List<Node> publicationNodes =
newsletterNode.getRelatedNodes("newsletterpublication");
Set<Publication> publications = new HashSet<Publication>();
@@ -141,7 +137,7 @@
}
public Set<Term> getTermsByPublication(int publicationId) {
- Node newsletterPublicationNode = getCloud().getNode(publicationId);
+ Node newsletterPublicationNode = cloud.getNode(publicationId);
NodeList relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
NodeList terms = relatedNewsletters.getNode(0).getRelatedNodes("term");
@@ -158,7 +154,7 @@
public void renamePublicationTitle(int publicationId) {
String now = DateFormatUtils.format(new Date(), "dd-MM-yyyy hh:mm");
- Node publicationNode = getCloud().getNode(publicationId);
+ Node publicationNode = cloud.getNode(publicationId);
String oldTitle = publicationNode.getStringValue("title");
String newTile = oldTitle;
String dateTime = "";
@@ -185,8 +181,8 @@
public List<Publication> getPublicationsByNewsletterAndPeriod(
int newsletterId, String title, String subject, Date startDate,
Date endDate, boolean paging) {
- NodeManager manager = getCloud().getNodeManager("newsletterpublication");
- Node newsletterNode = getCloud().getNode(newsletterId);
+ NodeManager manager = cloud.getNodeManager("newsletterpublication");
+ Node newsletterNode = cloud.getNode(newsletterId);
NodeQuery nodeQuery =
SearchUtil.createRelatedNodeListQuery(newsletterNode, "newsletterpublication",
"related");
@@ -195,7 +191,8 @@
if (startDate != null) {
SearchUtil.addDatetimeConstraint(nodeQuery,
manager.getField("creationdate"), startDate.getTime(), endDate.getTime());
- } else {
+ }
+ else {
SearchUtil.addDatetimeConstraint(nodeQuery,
manager.getField("creationdate"), Long.decode("1"), endDate.getTime());
}
@@ -209,8 +206,8 @@
public List<Publication> getPublications(String title, String subject,
String description, String intro,
boolean paging) {
PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
- NodeManager publicationManager =
getCloud().getNodeManager("newsletterpublication");
- NodeQuery query = getCloud().createNodeQuery();
+ NodeManager publicationManager =
cloud.getNodeManager("newsletterpublication");
+ NodeQuery query = cloud.createNodeQuery();
Step step = query.addStep(publicationManager);
query.setNodeStep(step);
if (StringUtils.isNotBlank(title)) {
Index: NewsletterSubscriptionCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- NewsletterSubscriptionCAOImpl.java 27 Oct 2008 05:56:30 -0000 1.34
+++ NewsletterSubscriptionCAOImpl.java 28 Oct 2008 11:13:36 -0000 1.35
@@ -51,10 +51,14 @@
this.cloud = cloud;
}
+ public void setCloud(Cloud cloud) {
+ this.cloud = cloud;
+ }
+
public List<Node> querySubcriptionByUser(int userId) {
- NodeManager recordManager =
getCloud().getNodeManager("subscriptionrecord");
- NodeQuery query = getCloud().createNodeQuery();
+ NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
+ NodeQuery query = cloud.createNodeQuery();
String subscriber = "subscriber";
Step theStep = null;
@@ -69,7 +73,7 @@
public void addSubscriptionRecord(Subscription subscription, int userId) {
String nodeType = "subscriptionrecord";
- NodeManager subscriptionrecordNodeManager =
getCloud().getNodeManager(nodeType);
+ NodeManager subscriptionrecordNodeManager =
cloud.getNodeManager(nodeType);
Node subscriptionrecordNode = subscriptionrecordNodeManager.createNode();
subscriptionrecordNode.setIntValue("subscriber", userId);
@@ -79,8 +83,8 @@
// add Relation to newsletter
int nodeNumber = subscription.getNewsletter().getId();
- Node newsletternode = getCloud().getNode(nodeNumber);
- RelationManager insrel =
getCloud().getRelationManager("subscriptionrecord", "newsletter",
"newslettered");
+ Node newsletternode = cloud.getNode(nodeNumber);
+ RelationManager insrel = cloud.getRelationManager("subscriptionrecord",
"newsletter", "newslettered");
subscriptionrecordNode.createRelation(newsletternode, insrel).commit();
subscription.setId(subscriptionrecordNode.getNumber());
}
@@ -89,7 +93,7 @@
log.debug("Modify subscription status " + subscription.getId() + " to "
+ subscription.getStatus());
String stauts = subscription.getStatus().toString();
- Node record = getCloud().getNode(subscription.getId());
+ Node record = cloud.getNode(subscription.getId());
record.setStringValue("status", stauts);
record.commit();
@@ -101,14 +105,14 @@
}
public void pause(int subscriptionId) {
- Node record = getCloud().getNode(subscriptionId);
+ Node record = cloud.getNode(subscriptionId);
record.setStringValue("status", "PAUSED");
record.commit();
}
public void modifySubscriptionFormat(Subscription subscription) {
int recordId = subscription.getId();
- Node record = getCloud().getNode(recordId);
+ Node record = cloud.getNode(recordId);
String format = subscription.getMimeType();
record.setStringValue("format", format);
@@ -117,16 +121,16 @@
public void addSubscriptionTerm(Subscription subscription, int termId) {
int recordId = subscription.getId();
- Node record = getCloud().getNode(recordId);
- Node term = getCloud().getNode(termId);
+ Node record = cloud.getNode(recordId);
+ Node term = cloud.getNode(termId);
- RelationManager insrel =
getCloud().getRelationManager("subscriptionrecord", "term", "termed");
+ RelationManager insrel = cloud.getRelationManager("subscriptionrecord",
"term", "termed");
record.createRelation(term, insrel).commit();
}
public void removeSubscriptionTerm(Subscription subscription, int termId) {
int recordId = subscription.getId();
- Node record = getCloud().getNode(recordId);
+ Node record = cloud.getNode(recordId);
List<Node> terms = record.getRelatedNodes("term");
Iterator<Node> termsit = terms.iterator();
@@ -134,7 +138,7 @@
for (int i = 0; i < terms.size(); i++) {
Node term = termsit.next();
if (termId != term.getNumber()) {
- RelationManager insrel =
getCloud().getRelationManager("subscriptionrecord", "term", "termed");
+ RelationManager insrel =
cloud.getRelationManager("subscriptionrecord", "term", "termed");
record.createRelation(term, insrel).commit();
}
}
@@ -144,7 +148,7 @@
log.debug("getSubscriptionrecord that newsletterId=" + newsletterId);
Node subscriptionNode = null;
- List<Node> records =
getCloud().getNode(newsletterId).getRelatedNodes("subscriptionrecord");
+ List<Node> records =
cloud.getNode(newsletterId).getRelatedNodes("subscriptionrecord");
for (Node record : records) {
if
(record.getStringValue("subscriber").equals(Integer.toString(userId))) {
subscriptionNode = record;
@@ -178,7 +182,7 @@
public Set<Term> getTerms(int subscriptionId) {
- List<Node> termList =
getCloud().getNode(subscriptionId).getRelatedNodes("term");
+ List<Node> termList =
cloud.getNode(subscriptionId).getRelatedNodes("term");
Set<Term> terms = new HashSet<Term>();
for (Node termNode : termList) {
@@ -194,7 +198,7 @@
public List<Subscription> getSubscription(int newsletterId) {
- List<Node> records =
getCloud().getNode(newsletterId).getRelatedNodes("subscriptionrecord");
+ List<Node> records =
cloud.getNode(newsletterId).getRelatedNodes("subscriptionrecord");
log.debug("Get subscriptions of newsletter:" + newsletterId + " and get
" + records.size() + " records in all");
List<Subscription> subscribers = new ArrayList<Subscription>();
for (Node record : records) {
@@ -210,8 +214,8 @@
public void createSubscription(int userId, int newsletterId) {
log.debug("Create subscription user:" + userId + " newsletter:" +
newsletterId);
- NodeManager recordManager =
getCloud().getNodeManager("subscriptionrecord");
- Node newsletter = getCloud().getNode(newsletterId);
+ NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
+ Node newsletter = cloud.getNode(newsletterId);
Node recordNode = recordManager.createNode();
recordNode.setStringValue("status",
Subscription.STATUS.ACTIVE.toString());
@@ -219,13 +223,13 @@
recordNode.setStringValue("format", "text/html");
recordNode.commit();
- RelationManager insrel =
getCloud().getRelationManager("subscriptionrecord", "newsletter",
"newslettered");
+ RelationManager insrel = cloud.getRelationManager("subscriptionrecord",
"newsletter", "newslettered");
recordNode.createRelation(newsletter, insrel).commit();
}
public Subscription getSubscriptionById(int id) {
- Node subscriptionNode = getCloud().getNode(id);
+ Node subscriptionNode = cloud.getNode(id);
Subscription subscription = convertFromNode(subscriptionNode);
List<Node> newsletterNodes =
subscriptionNode.getRelatedNodes("newsletter");
@@ -237,7 +241,7 @@
}
public void updateSubscription(Subscription subscription) {
- Node node = getCloud().getNode(subscription.getId());
+ Node node = cloud.getNode(subscription.getId());
node.setStringValue("status", subscription.getStatus().toString());
node.setDateValue("pausetill", subscription.getPausedTill());
node.commit();
@@ -246,7 +250,7 @@
public List<Subscription> getSubscriptionByUserIdAndStatus(int userId,
STATUS status) {
- NodeManager recordManager =
getCloud().getNodeManager("subscriptionrecord");
+ NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
Query query = recordManager.createQuery();
if (null != status) {
@@ -266,8 +270,8 @@
public List<Node> getAllSubscriptions() {
- NodeQuery query = getCloud().createNodeQuery();
- Step step =
query.addStep(getCloud().getNodeManager("subscriptionrecord"));
+ NodeQuery query = cloud.createNodeQuery();
+ Step step = query.addStep(cloud.getNodeManager("subscriptionrecord"));
query.setNodeStep(step);
List<Node> list = query.getList();
@@ -275,8 +279,8 @@
}
public Set<Node> getRecordByNewsletterAndName(int newsletterId, String
termName) {
- NodeManager manager = getCloud().getNodeManager("term");
- Node newsletterNode = getCloud().getNode(newsletterId);
+ NodeManager manager = cloud.getNodeManager("term");
+ Node newsletterNode = cloud.getNode(newsletterId);
NodeQuery nodeQuery =
SearchUtil.createRelatedNodeListQuery(newsletterNode, "term", "posrel");
if (StringUtils.isNotBlank(termName)) {
@@ -304,7 +308,7 @@
}
public Set<Node> getNewslettersByScriptionRecord(int authenticationId) {
- NodeManager recordManager =
getCloud().getNodeManager("subscriptionrecord");
+ NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
Query query = recordManager.createQuery();
SearchUtil.addEqualConstraint(query,
recordManager.getField("subscriber"), Integer.toString(authenticationId));
List<Node> subscriptions = query.getList();
@@ -319,21 +323,21 @@
return newsletters;
}
- public List<Newsletter> getNewslettersByScription(int subscriberId, String
title, boolean paging) {
+ public List<Newsletter> getNewslettersByScription(int subscriberId, String
title, boolean paging){
PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
- NodeManager subscriptionNodeManager =
getCloud().getNodeManager("subscriptionrecord");
- NodeManager newsletterNodeManager =
getCloud().getNodeManager("newsletter");
- NodeQuery query = getCloud().createNodeQuery();
+ NodeManager subscriptionNodeManager =
cloud.getNodeManager("subscriptionrecord");
+ NodeManager newsletterNodeManager = cloud.getNodeManager("newsletter");
+ NodeQuery query = cloud.createNodeQuery();
Step subscriptionStep = query.addStep(subscriptionNodeManager);
query.setNodeStep(subscriptionStep);
- if (subscriberId > 0) {
+ if(subscriberId>0){
SearchUtil.addEqualConstraint(query,
subscriptionNodeManager.getField("subscriber"), Integer.toString(subscriberId));
}
- RelationStep newsletterRelStep =
query.addRelationStep(newsletterNodeManager, "newslettered", "source");
+ RelationStep newsletterRelStep =
query.addRelationStep(newsletterNodeManager, "newslettered","source");
Step newsletterStep = newsletterRelStep.getNext();
query.setNodeStep(newsletterStep);
- if (StringUtils.isNotBlank(title)) {
+ if(StringUtils.isNotBlank(title)){
SearchUtil.addLikeConstraint(query,
newsletterNodeManager.getField("title"), title);
}
if (paging) {
@@ -349,7 +353,7 @@
}
public Set<Node> getTermsByScriptionRecord(int authenticationId) {
- NodeManager recordManager =
getCloud().getNodeManager("subscriptionrecord");
+ NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
Query query = recordManager.createQuery();
SearchUtil.addEqualConstraint(query,
recordManager.getField("subscriber"), Integer.toString(authenticationId));
List<Node> subscriptions = query.getList();
@@ -377,13 +381,13 @@
}
private Node getSubscriptionNodeById(int subscriptionId) {
- return getCloud().getNode(subscriptionId);
+ return cloud.getNode(subscriptionId);
}
public Node getSubscriptionNode(int newsletterId, int userId) {
Node subscriptionNode = null;
- List<Node> records =
getCloud().getNode(newsletterId).getRelatedNodes("subscriptionrecord");
+ List<Node> records =
cloud.getNode(newsletterId).getRelatedNodes("subscriptionrecord");
for (Node record : records) {
if
(record.getStringValue("subscriber").equals(Integer.toString(userId))) {
subscriptionNode = record;
@@ -400,11 +404,11 @@
}
public List<Node> getSubscriptionsByTerms(int newsletterId, String terms) {
- NodeManager termNodeManager = getCloud().getNodeManager("term");
- NodeManager newsletterNodeManager =
getCloud().getNodeManager("newsletter");
- NodeManager subscriptionNodeManger =
getCloud().getNodeManager("subscriptionrecord");
+ NodeManager termNodeManager = cloud.getNodeManager("term");
+ NodeManager newsletterNodeManager = cloud.getNodeManager("newsletter");
+ NodeManager subscriptionNodeManger =
cloud.getNodeManager("subscriptionrecord");
- NodeQuery query = getCloud().createNodeQuery();
+ NodeQuery query = cloud.createNodeQuery();
List<Node> subscriptions;
if (StringUtils.isNotBlank(terms)) {
Step termStep = query.addStep(termNodeManager);
@@ -424,7 +428,7 @@
query.setNodeStep(subscriptionStep);
subscriptions = query.getList();
} else {
- Node newsletterNode = getCloud().getNode(newsletterId);
+ Node newsletterNode = cloud.getNode(newsletterId);
subscriptions =
newsletterNode.getRelatedNodes(subscriptionNodeManger, "newslettered",
"destination");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
