Author: jkoster
Date: 2010-02-02 16:33:25 +0100 (Tue, 02 Feb 2010)
New Revision: 40806
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/schedule.xml
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/bounce/ReceiveThread.java
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterServiceImpl.java
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java
Log:
CMSC-1633 - Small code changes to make it better readable and logic to follow.
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/schedule.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/schedule.xml
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/schedule.xml
2010-02-02 15:33:25 UTC (rev 40806)
@@ -8,19 +8,19 @@
<singular xml:lang="zh">调度</singular>
</names>
<descriptions>
- <description xml:lang="nl">Newsletter Schedule</description>
+ <description xml:lang="nl">Nieuwsbrief Schedule</description>
<description xml:lang="en">Newsletter Schedule</description>
<description xml:lang="zh">时事通讯调度</description>
</descriptions>
<fieldlist>
<field name="expression">
<descriptions>
- <description xml:lang="nl">Expression</description>
+ <description xml:lang="nl">Expressie</description>
<description xml:lang="en">Expression</description>
<description xml:lang="zh">表达式</description>
</descriptions>
<gui>
- <guiname xml:lang="nl">Expression</guiname>
+ <guiname xml:lang="nl">Expressie</guiname>
<guiname xml:lang="en">Expression</guiname>
<guiname xml:lang="zh">表达式</guiname>
</gui>
@@ -36,12 +36,12 @@
</field>
<field name="createdatetime">
<descriptions>
- <description xml:lang="nl">Create Datetime</description>
+ <description xml:lang="nl">Creatie tijdstip</description>
<description xml:lang="en">Create Datetime</description>
<description xml:lang="zh">创建日期</description>
</descriptions>
<gui>
- <guiname xml:lang="nl">Create Datetime</guiname>
+ <guiname xml:lang="nl">Creatie tijdstip</guiname>
<guiname xml:lang="en">Create Datetime</guiname>
<guiname xml:lang="zh">创建日期</guiname>
</gui>
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/config/builders/newsletter/subscriptionrecord.xml
2010-02-02 15:33:25 UTC (rev 40806)
@@ -4,10 +4,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
http://www.mmbase.org/xmlns/builder.xsd";>
<names>
<singular xml:lang="nl">subscriptionrecord</singular>
- <singular xml:lang="en">subscriptionrecord</singular>
+ <singular xml:lang="en">subscription record</singular>
<singular xml:lang="zh">订阅记录</singular>
<plural xml:lang="nl">subscriptionrecord</plural>
- <plural xml:lang="en">subscriptionrecord</plural>
+ <plural xml:lang="en">subscription record</plural>
<plural xml:lang="zh">订阅记录</plural>
</names>
<fieldlist>
@@ -71,7 +71,7 @@
</field>
<field name="pausetill">
<gui>
- <guiname xml:lang="nl">pause tot</guiname>
+ <guiname xml:lang="nl">pauze tot</guiname>
<guiname xml:lang="en">pause till</guiname>
<guiname xml:lang="zh">暂停到</guiname>
</gui>
@@ -97,7 +97,7 @@
</field>
<field name="last_sent">
<gui>
- <guiname xml:lang="nl">last sent</guiname>
+ <guiname xml:lang="nl">laatst verzonden</guiname>
<guiname xml:lang="en">last sent</guiname>
<guiname xml:lang="zh">上次发送日期</guiname>
</gui>
@@ -110,7 +110,7 @@
</field>
<field name="last_bounce">
<gui>
- <guiname xml:lang="nl">last bounce</guiname>
+ <guiname xml:lang="nl">laatste bounce</guiname>
<guiname xml:lang="en">last bounce</guiname>
<guiname xml:lang="zh">上次退信日期</guiname>
</gui>
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties
2010-02-02 15:33:25 UTC (rev 40806)
@@ -274,7 +274,7 @@
newsletter.bounce.title = Nieuwsbrief Bounces
newsletter.bounce.number = Nummer
newsletter.bounce.subscriber = Lid
-newsletter.bounce.newsletter = Nieuwsbroef
+newsletter.bounce.newsletter = Nieuwsbrief
newsletter.bounce.bouncedate = Bounce datum
newsletter.bounce.bouncecontent = Bounce inhoud
newsletter.bounce.window.close = Sluit venster
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2010-02-02 15:33:25 UTC (rev 40806)
@@ -43,11 +43,11 @@
public List<Node> getSubscriptionsByTerms(int newsletterId, String terms);
- void updateLastBounce(int subscriptionId);
+ void updateLastBounce(Node subscription);
Node getSubscriptionNode(int newsletterId, int userId);
- public void pause(int subscriptionId);
+ public void pause(Node subscriptionId);
public Set<Node> getRecordByNewsletterAndName(int newsletterId, String
termName);
@@ -59,5 +59,5 @@
public int countSubscription(int id);
- public void deleteSubscriptionsByAuthId(Long anthId);
+ public void deleteSubscriptionsByAuthId(long anthId);
}
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2010-02-02 15:33:25 UTC (rev 40806)
@@ -98,25 +98,24 @@
public void modifySubscriptionStauts(Subscription subscription) {
log.debug("Modify subscription status " + subscription.getId() + " to "
+ subscription.getStatus());
- String stauts = subscription.getStatus().toString();
+ String status = subscription.getStatus().toString();
Node record = cloud.getNode(subscription.getId());
- if ("INACTIVE".equals(stauts)) {
+ if ("INACTIVE".equals(status)) {
if (Publish.isPublished(record)) {
Publish.unpublish(record);
}
record.deleteRelations();
record.delete();
} else {
- record.setStringValue("status", stauts);
+ record.setStringValue("status", status);
record.commit();
}
}
- public void pause(int subscriptionId) {
- Node record = cloud.getNode(subscriptionId);
- record.setStringValue("status", "PAUSED");
- record.commit();
+ public void pause(Node subscriptionNode) {
+ subscriptionNode.setStringValue("status", "PAUSED");
+ subscriptionNode.commit();
}
public void modifySubscriptionFormat(Subscription subscription) {
@@ -185,14 +184,13 @@
subscription.getTerms().add(term);
}
return subscription;
- } else {
- log.debug("Get subscription failed,user " + userId + " may not
subscripbe " + newsletterId);
- return null;
}
+
+ log.debug("Get subscription failed, user " + userId + " may not
subscribe " + newsletterId);
+ return null;
}
public Set<Term> getTerms(int subscriptionId) {
-
List<Node> termList =
cloud.getNode(subscriptionId).getRelatedNodes("term");
Set<Term> terms = new HashSet<Term>();
@@ -256,7 +254,6 @@
node.setStringValue("status", subscription.getStatus().toString());
node.setDateValue("pausetill", subscription.getPausedTill());
node.commit();
-
}
public List<Subscription> getSubscriptionByUserIdAndStatus(int userId,
STATUS status) {
@@ -280,7 +277,6 @@
}
public List<Node> getAllSubscriptions() {
-
NodeQuery query = cloud.createNodeQuery();
Step step = query.addStep(cloud.getNodeManager("subscriptionrecord"));
query.setNodeStep(step);
@@ -379,9 +375,8 @@
return terms;
}
- public void updateLastBounce(int subscriptionId) {
+ public void updateLastBounce(Node subscription) {
// todo test.
- Node subscription = getSubscriptionNodeById(subscriptionId);
if (subscription.getIntValue("count_bounces") > 0) {
subscription.setIntValue("count_bounces",
subscription.getIntValue("count_bounces") + 1);
} else {
@@ -407,7 +402,7 @@
}
if (null == subscriptionNode) {
- log.debug("Get subscription failed,user " + userId + " may not
subscripbe " + newsletterId);
+ log.debug("Get subscription failed, user " + userId + " may not
subscribe " + newsletterId);
return null;
}
@@ -424,7 +419,6 @@
if (StringUtils.isNotBlank(terms)) {
Step termStep = query.addStep(termNodeManager);
query.setNodeStep(termStep);
- String nameLikeStr = null;
String[] tmpTerms = terms.split(" ");
for (String termName : tmpTerms) {
SearchUtil.addLikeConstraint(query,
termNodeManager.getField("name"), termName);
@@ -459,10 +453,10 @@
return subscribers;
}
- public void deleteSubscriptionsByAuthId(Long anthId) {
+ public void deleteSubscriptionsByAuthId(long authId) {
NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
Query query = recordManager.createQuery();
- SearchUtil.addEqualConstraint(query,
recordManager.getField("subscriber"), String.valueOf(anthId));
+ SearchUtil.addEqualConstraint(query,
recordManager.getField("subscriber"), String.valueOf(authId));
List<Node> subscriptions = query.getList();
for (Node subscription : subscriptions) {
if (ServerUtil.isStaging()) {
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterBounceAction.java
2010-02-02 15:33:25 UTC (rev 40806)
@@ -30,7 +30,7 @@
if (StringUtils.isNotEmpty(strOffset)) {
offset = Integer.parseInt(strOffset);
}
- List<NewsletterBounce> bounces =
NewsletterBounceUtil.getBounceRecord(offset * pageSize, pageSize, order,
+ List<NewsletterBounce> bounces =
NewsletterBounceUtil.getBounceRecords(offset * pageSize, pageSize, order,
direction);
int count = NewsletterBounceUtil.getTotalCount();
request.setAttribute("resultList", bounces);
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/bounce/ReceiveThread.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/bounce/ReceiveThread.java
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/bounce/ReceiveThread.java
2010-02-02 15:33:25 UTC (rev 40806)
@@ -105,14 +105,14 @@
}
if (line.toUpperCase().startsWith("RCPT TO:")) {
- String recepient[] = parseAddress(line);
- if (recepient.length != 2) {
+ String recipient[] = parseAddress(line);
+ if (recipient.length != 2) {
writer.write("553 This user format is unknown here\r\n");
writer.flush();
return;
}
- String username = recepient[0];
+ String username = recipient[0];
if (username.startsWith("bounce-")) {
params = username.replace("bounce-", "").split("=");
int pId = Integer.parseInt(params[0]);
@@ -132,7 +132,7 @@
char[] last5chars = new char[5];
int c;
- StringBuffer data = new StringBuffer();
+ StringBuilder data = new StringBuilder();
while (verifyEndSymbol(last5chars)) {
while ((c = reader.read()) == -1) {
try {
@@ -161,7 +161,6 @@
}
private boolean verifyEndSymbol(char[] last5chars) {
-
boolean isreading;
char[] endchars = {'\r', '\n', '.', '\r', '\n'};
isreading = false;
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterServiceImpl.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterServiceImpl.java
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterServiceImpl.java
2010-02-02 15:33:25 UTC (rev 40806)
@@ -101,10 +101,10 @@
int maxAllowedBounce = newsletterNode.getIntValue("max_bounces");
if (bouncesCount > maxAllowedBounce) {
- subscriptionCAO.pause(subscriptionNode.getNumber());
+ subscriptionCAO.pause(subscriptionNode);
}
statisticCAO.logPublication(userId, newsletterId,
StatisticResult.HANDLE.BOUNCE);
- subscriptionCAO.updateLastBounce(subscriptionNode.getNumber());
+ subscriptionCAO.updateLastBounce(subscriptionNode);
}
private List<Newsletter> getAllNewsletterBySubscriber(String subscriber,
boolean paging) {
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java
2010-02-02 15:33:23 UTC (rev 40805)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterBounceUtil.java
2010-02-02 15:33:25 UTC (rev 40806)
@@ -18,7 +18,7 @@
import com.finalist.newsletter.services.CommunityModuleAdapter;
public class NewsletterBounceUtil {
- public static List<NewsletterBounce> getBounceRecord(int offset, int
pageSize, String order, String direction) {
+ public static List<NewsletterBounce> getBounceRecords(int offset, int
pageSize, String order, String direction) {
List<NewsletterBounce> bounces = new ArrayList<NewsletterBounce>();
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
NodeManager bounceManager = cloud.getNodeManager("newsletterbounce");
@@ -79,13 +79,12 @@
}
public static void copyProperties(Node srcBounceNode, NewsletterBounce
desBounce) {
-
- Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
desBounce.setId(srcBounceNode.getNumber());
desBounce.setNewsletterId(srcBounceNode.getIntValue("newsletter"));
desBounce.setUserId(srcBounceNode.getIntValue("userid"));
if (srcBounceNode.getIntValue("newsletter") > 0) {
+ Cloud cloud = srcBounceNode.getCloud();
Node publicationNode =
cloud.getNode(srcBounceNode.getIntValue("newsletter"));
desBounce.setNewsLetterTitle(publicationNode.getStringValue("title"));
}
@@ -98,7 +97,6 @@
desBounce.setBounceDate(srcBounceNode.getDateValue("bouncedate"));
desBounce.setBounceContent(srcBounceNode.getStringValue("content"));
-
}
public static NewsletterBounce getNewsletterBounce(int number) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
