Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterCAOImpl.java NewsletterPublicationCAOImpl.java
NewsletterSubscriptionCAOImpl.java
Log Message:
CMSC-703 change tag to term
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-703
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterCAOImpl.java 24 Apr 2008 09:21:03 -0000 1.9
+++ NewsletterCAOImpl.java 29 Apr 2008 01:37:04 -0000 1.10
@@ -7,14 +7,13 @@
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.NodeQuery;
-import org.mmbase.bridge.Query;
import org.mmbase.storage.search.Step;
import com.finalist.newsletter.cao.util.NlUtil;
import com.finalist.newsletter.cao.NewsletterCAO;
import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Tag;
+import com.finalist.newsletter.domain.Term;
public class NewsletterCAOImpl implements NewsletterCAO {
private Cloud cloud;
@@ -40,16 +39,16 @@
newsletter.setId(newsletterNode.getIntValue("number"));
newsletter.setTitle(newsletterNode.getStringValue("title"));
- List<Node> tagList = newsletterNode.getRelatedNodes("tag");
- Iterator tagIt = tagList.iterator();
+ List<Node> terms = newsletterNode.getRelatedNodes("term");
+ Iterator termsIt = terms.iterator();
- for (int i = 0; i < tagList.size(); i++) {
- Tag tag = new Tag();
- Node tagNode = (Node) tagIt.next();
- tag.setId(tagNode.getNumber());
- tag.setName(tagNode.getStringValue("name"));
- tag.setSubscription(false);
- newsletter.getTags().add(tag);
+ for (int i = 0; i < terms.size(); i++) {
+ Term term = new Term();
+ Node termNode = (Node) termsIt.next();
+ term.setId(termNode.getNumber());
+ term.setName(termNode.getStringValue("name"));
+ term.setSubscription(false);
+ newsletter.getTerms().add(term);
}
return newsletter;
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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterPublicationCAOImpl.java 22 Apr 2008 03:35:53 -0000 1.5
+++ NewsletterPublicationCAOImpl.java 29 Apr 2008 01:37:04 -0000 1.6
@@ -1,29 +1,25 @@
package com.finalist.newsletter.cao.impl;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Field;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeManager;
-import org.mmbase.bridge.NodeQuery;
+import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.navigation.NavigationUtil;
+import com.finalist.newsletter.NewsletterSendFailException;
+import com.finalist.newsletter.cao.NewsletterPublicationCAO;
+import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Term;
+import com.finalist.newsletter.util.POConvertUtils;
+import com.finalist.portlets.newsletter.NewsletterContentPortlet;
+import org.apache.commons.lang.StringUtils;
+import org.mmbase.bridge.*;
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 org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
-import com.finalist.newsletter.cao.NewsletterPublicationCAO;
-import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.util.POConvertUtils;
-import com.finalist.newsletter.NewsletterSendFailException;
-import com.finalist.cmsc.navigation.NavigationUtil;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
public class NewsletterPublicationCAOImpl implements NewsletterPublicationCAO {
@@ -39,78 +35,83 @@
this.cloud = cloud;
}
- public List<Publication> getIntimePublication() {
+ public List<Integer> getIntimePublicationIds() {
+
NodeQuery query = cloud.createNodeQuery();
+
NodeManager pubManager = cloud.getNodeManager("newsletterpublication");
Step theStep = query.addStep(pubManager);
query.setNodeStep(theStep);
+
Field field = pubManager.getField("status");
Constraint titleConstraint = SearchUtil.createEqualConstraint(query,
field, Publication.STATUS.READY.toString());
SearchUtil.addConstraint(query, titleConstraint);
List<Node> pubNodes = query.getList();
- return convert(pubNodes);
- }
- public void setStatus(Publication publication, Publication.STATUS status) {
- Node publicationNode = cloud.getNode(publication.getId());
- publicationNode.setStringValue("status", status.toString());
- publicationNode.commit();
+ List<Integer> inTimePUblicationIds = new ArrayList<Integer>();
+ for (Node node : pubNodes) {
+ inTimePUblicationIds.add(node.getNumber());
}
- private Publication convert(Node node) {
- Publication pub = new Publication();
- pub.setId(node.getNumber());
- pub.setStatus(Publication.STATUS.valueOf(node.getStringValue("status")));
- return pub;
- }
-
- private List<Publication> convert(List<Node> nodeList) {
- List<Publication> pubs = new ArrayList<Publication>();
-
- for (Node node : nodeList) {
- pubs.add(convert(node));
+ return inTimePUblicationIds;
}
- return pubs;
+ public void setStatus(int publicationId, Publication.STATUS status) {
+ Node publicationNode = cloud.getNode(publicationId);
+ publicationNode.setStringValue("status", status.toString());
+ publicationNode.commit();
}
public Publication getPublication(int number) {
Node newsletterPublicationNode = cloud.getNode(number);
- String hostUrl = getHostUrl();
- String newsletterPath = getNewsletterPath(newsletterPublicationNode);
- String newsletterUrl = "".concat(hostUrl).concat(newsletterPath);
-
List<Node> relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
-
- log.debug("Get "+relatedNewsletters.size() +" related newsletter");
+ log.debug("Get " + relatedNewsletters.size() + " related newsletter");
Publication pub = new Publication();
pub.setId(newsletterPublicationNode.getNumber());
pub.setStatus(Publication.STATUS.valueOf(newsletterPublicationNode.getStringValue("status")));
- pub.setUrl(newsletterUrl);
-
+ pub.setUrl(getPublicationURL(number));
Newsletter newsletter = new Newsletter();
- new
POConvertUtils<Newsletter>().convert(newsletter,relatedNewsletters.get(0));
+
+ new POConvertUtils<Newsletter>().convert(newsletter,
relatedNewsletters.get(0));
pub.setNewsletter(newsletter);
return pub;
}
+ public String getPublicationURL(int publciationId) {
+
+ Node publicationNode = cloud.getNode(publciationId);
+ String hostUrl = getHostUrl();
+ String newsletterPath = getNewsletterPath(publicationNode);
+
+
+ return "".concat(hostUrl).concat(newsletterPath);
+ }
+
+ public int getNewsletterId(int publicationId) {
+ Node newsletterPublicationNode = cloud.getNode(publicationId);
+ List<Node> relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
+
+ log.debug("Get " + relatedNewsletters.size() + " related newsletter");
+
+ return relatedNewsletters.get(0).getNumber();
+ }
+
protected String getNewsletterPath(Node newsletterPublicationNode) {
- String newsletterPath =
NavigationUtil.getPathToRootString(newsletterPublicationNode, true);
- return newsletterPath;
+ return NavigationUtil.getPathToRootString(newsletterPublicationNode,
true);
}
protected String getHostUrl() {
String hostUrl = PropertiesUtil.getProperty("host");
- if(StringUtils.isEmpty(hostUrl)){
+ if (StringUtils.isEmpty(hostUrl)) {
throw new NewsletterSendFailException("get property <host> from
system property and get nothing");
}
- log.debug("get property <host> from system property and get:"+hostUrl);
+ log.debug("get property <host> from system property and get:" + hostUrl);
if (!hostUrl.endsWith("/")) {
hostUrl += "/";
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterSubscriptionCAOImpl.java 25 Apr 2008 18:18:35 -0000 1.14
+++ NewsletterSubscriptionCAOImpl.java 29 Apr 2008 01:37:04 -0000 1.15
@@ -1,21 +1,16 @@
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 net.sf.mmapps.modules.cloudprovider.CloudProvider;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.mmbase.bridge.Cloud;
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.Query;
@@ -27,7 +22,7 @@
import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.domain.Tag;
+import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.services.CommunityModuleAdapter;
import static com.finalist.newsletter.domain.Subscription.STATUS;
@@ -92,7 +87,7 @@
if ("INACTIVE".equals(stauts)) {
record.setStringValue("format", "html");
- record.deleteRelations("tagged");
+ record.deleteRelations("termed");
record.commit();
}
@@ -107,29 +102,29 @@
record.commit();
}
- public void addSubscriptionTag(Subscription subscription,int tagId) {
+ public void addSubscriptionTerm(Subscription subscription,int termId) {
int recordId = subscription.getId();
Node record = cloud.getNode(recordId);
- Node tag = cloud.getNode(tagId);
+ Node term = cloud.getNode(termId);
RelationManager insrel = cloud.getRelationManager(
- "subscriptionrecord", "tag", "tagged");
- record.createRelation(tag, insrel).commit();
+ "subscriptionrecord", "term", "termed");
+ record.createRelation(term, insrel).commit();
}
- public void removeSubscriptionTag(Subscription subscription,int tagId) {
+ public void removeSubscriptionTerm(Subscription subscription,int
termId) {
int recordId = subscription.getId();
Node record = cloud.getNode(recordId);
- List<Node> taglist = record.getRelatedNodes("tag");
- Iterator taglistIt = taglist.iterator();
- record.deleteRelations("tagged");
- for (int i = 0; i < taglist.size(); i++) {
- Node tag = (Node) taglistIt.next();
- if (tagId != tag.getNumber()) {
+ List<Node> terms = record.getRelatedNodes("term");
+ Iterator termsit = terms.iterator();
+ record.deleteRelations("termed");
+ for (int i = 0; i < terms.size(); i++) {
+ Node term = (Node) termsit.next();
+ if (termId != term.getNumber()) {
RelationManager insrel =
cloud.getRelationManager(
- "subscriptionrecord",
"tag", "tagged");
- record.createRelation(tag,
insrel).commit();
+ "subscriptionrecord",
"term", "termed");
+ record.createRelation(term,
insrel).commit();
}
}
}
@@ -163,16 +158,16 @@
subscription.setId(subscriptionId);
subscription.setMimeType(subscriptionNode.getStringValue("subscriptionrecord.format"));
subscription.setStatus(STATUS.valueOf(subscriptionNode.getStringValue("subscriptionrecord.status")));
- List<Node> tagList =
cloud.getNode(subscriptionId).getRelatedNodes("tag");
+ List<Node> terms =
cloud.getNode(subscriptionId).getRelatedNodes("term");
- Iterator tagIt = tagList.iterator();
- for(int i=0;i<tagList.size();i++){
- Tag tag = new Tag();
- Node tagNode = (Node) tagIt.next();
- tag.setId(tagNode.getNumber());
- tag.setName(tagNode.getStringValue("name"));
- tag.setSubscription(true);
- subscription.getTags().add(tag);
+ Iterator termIt = terms.iterator();
+ for(int i=0;i<terms.size();i++){
+ Term term = new Term();
+ Node termNode = (Node) termIt.next();
+ term.setId(termNode.getNumber());
+ term.setName(termNode.getStringValue("name"));
+ term.setSubscription(true);
+ subscription.getTerms().add(term);
}
return subscription;
} else {
@@ -182,24 +177,24 @@
}
}
- public Set<Tag> getTags(int subscriptionId) {
+ public Set<Term> getTerms(int subscriptionId) {
- List<Node> tagList =
cloud.getNode(subscriptionId).getRelatedNodes("tag");
- Set<Tag> tags = new HashSet<Tag>();
+ List<Node> termList =
cloud.getNode(subscriptionId).getRelatedNodes("term");
+ Set<Term> terms = new HashSet<Term>();
- for (Node tagNode : tagList) {
- Tag tag = new Tag();
- tag.setId(tagNode.getNumber());
- tag.setName(tagNode.getStringValue("name"));
- tag.setSubscription(true);
+ for (Node termNode : termList) {
+ Term term = new Term();
+ term.setId(termNode.getNumber());
+ term.setName(termNode.getStringValue("name"));
+ term.setSubscription(true);
}
- return tags;
+ return terms;
}
- public List<Subscription> getSubscriptionByNewsletterId(int newsletterId) {
+ public List<Subscription> getSubscription(int newsletterId) {
List<Node> records =
cloud.getNode(newsletterId).getRelatedNodes("subscriptionrecord");
log.debug("Get subscriptions of newsletter:"+newsletterId+" and get
"+records.size()+" records in all");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
