Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv18989/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterCAOImpl.java NewsletterPublicationCAOImpl.java
Log Message:
CMSC-990 replace subscriber parts : showing,paging with ui tags
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-990
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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterCAOImpl.java 25 Jul 2008 15:53:10 -0000 1.19
+++ NewsletterCAOImpl.java 27 Jul 2008 07:38:09 -0000 1.20
@@ -35,7 +35,7 @@
Step step = query.addStep(cloud.getNodeManager("term"));
query.setNodeStep(step);
NodeList list = query.getList();
- return list;
+ return MMBaseNodeMapper.convertList(list, Term.class);
}
public List<Newsletter> getNewsletterByConstraint(String property,
String constraintType, String value) {
@@ -70,31 +70,12 @@
public Newsletter getNewsletterById(int id) {
Node newsletterNode = cloud.getNode(id);
-
- // <<<<<<< NewsletterCAOImpl.java
- // Newsletter newsletter = convertFromNode(newsletterNode);
- //
- // List<Node> terms = newsletterNode.getRelatedNodes("term");
- // log.debug("get newsletter by id:" + id + ",and get " +
terms.size() +
- // " terms with it.");
- // Iterator termsIt = terms.iterator();
- //
- // 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);
- // }
- // =======
Newsletter newsletter = convertFromNode(newsletterNode);
NodeList terms = newsletterNode.getRelatedNodes("term");
log.debug("get newsletter by id:" + id + ",and get " +
terms.size() + " terms with it.");
List<Term> termList = MMBaseNodeMapper.convertList(terms,
Term.class);
newsletter.getTerms().addAll(termList);
- // >>>>>>> 1.16
return newsletter;
}
@@ -116,8 +97,6 @@
NodeManager newsletterNodeManager =
cloud.getNodeManager("newsletter");
NodeQuery query = cloud.createNodeQuery();
- // <<<<<<< NewsletterCAOImpl.java
-
Step newsletterStep = query.addStep(newsletterNodeManager);
query.setNodeStep(newsletterStep);
Constraint idConstraint =
SearchUtil.createEqualConstraint(query,
newsletterNodeManager.getField("number"), newsletterId);
@@ -125,12 +104,7 @@
RelationStep relationStep =
query.addRelationStep(termNodeManager, "posrel", "destination");
Step termStep = relationStep.getNext();
- // =======
- //
- // Step termStep = query.addStep(termNodeManager);
- // >>>>>>> 1.16
query.setNodeStep(termStep);
- // <<<<<<< NewsletterCAOImpl.java
if (StringUtils.isNotBlank(name)) {
SearchUtil.addLikeConstraint(query,
termNodeManager.getField("name"), name);
}
@@ -149,15 +123,8 @@
term.setId(tmpNum);
term.setName(tmpName);
terms.add(term);
- // =======
- //
- // if(StringUtils.isNotBlank(name)){
- // Constraint nameConstrant
=SearchUtil.createLikeConstraint(query,
- // termNodeManager.getField("name"), "%" + name + "%" );
- // SearchUtil.addConstraint(query, nameConstrant);
- // >>>>>>> 1.16
+
}
- // <<<<<<< NewsletterCAOImpl.java
return terms;
}
@@ -170,15 +137,8 @@
Step newsletterStep = query.addStep(newsletterNodeManager);
query.setNodeStep(newsletterStep);
Constraint idConstraint =
SearchUtil.createEqualConstraint(query,
newsletterNodeManager.getField("number"), newsletterId);
- // =======
- //
- // RelationStep rStep =
query.addRelationStep(newsletterNodeManager,
- // "posrel", "destination");
- // Constraint idConstraint =
SearchUtil.createEqualConstraint(query,
- // newsletterNodeManager.getField("number"), newsletterId);
- // >>>>>>> 1.16
+
SearchUtil.addConstraint(query, idConstraint);
- // <<<<<<< NewsletterCAOImpl.java
RelationStep relationStep =
query.addRelationStep(termNodeManager, "posrel", "destination");
Step termStep = relationStep.getNext();
@@ -187,13 +147,6 @@
SearchUtil.addLikeConstraint(query,
termNodeManager.getField("name"), name);
}
return query.getList().size();
- // =======
- //
- // System.out.println(query.toSql());
- // NodeList nodeList = query.getList();
- // System.out.println(nodeList.toString());
- // return new HashSet<Term>();
- // >>>>>>> 1.16
}
public void processBouncesOfPublication(String publicationId, String userId,
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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterPublicationCAOImpl.java 25 Jul 2008 15:53:10 -0000 1.17
+++ NewsletterPublicationCAOImpl.java 27 Jul 2008 07:38:09 -0000 1.18
@@ -1,25 +1,40 @@
package com.finalist.newsletter.cao.impl;
-import java.util.*;
+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.time.DateFormatUtils;
-import org.mmbase.bridge.*;
+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.util.Queries;
import org.mmbase.bridge.util.SearchUtil;
-import org.mmbase.storage.search.*;
-import org.mmbase.storage.search.implementation.*;
+import org.mmbase.storage.search.Constraint;
+import org.mmbase.storage.search.FieldCompareConstraint;
+import org.mmbase.storage.search.Step;
+import org.mmbase.storage.search.StepField;
+import org.mmbase.storage.search.implementation.BasicCompositeConstraint;
+import
org.mmbase.storage.search.implementation.BasicFieldValueBetweenConstraint;
+import org.mmbase.storage.search.implementation.BasicFieldValueConstraint;
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.newsletter.cao.NewsletterPublicationCAO;
-import com.finalist.newsletter.domain.*;
+import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.util.NewsletterUtil;
import com.finalist.newsletter.util.POConvertUtils;
-
-
public class NewsletterPublicationCAOImpl implements NewsletterPublicationCAO {
private static Logger log =
Logging.getLoggerInstance(NewsletterPublicationCAOImpl.class.getName());
@@ -114,26 +129,24 @@
Set<Publication> publications = new HashSet<Publication>();
- for(Node publicationNode:publicationNodes){
-
if(null==status||status.toString().equals(publicationNode.getStringValue("status"))){
+ for (Node publicationNode : publicationNodes) {
+ if (null == status ||
status.toString().equals(publicationNode.getStringValue("status"))) {
publications.add(convertFromNode(publicationNode));
}
}
- log.debug(String.format("Get %s publications of newsletter %s in %s
status",publications.size(),id,status));
+ log.debug(String.format("Get %s publications of newsletter %s
in %s status", publications.size(), id, status));
return new ArrayList<Publication>(publications);
}
- private Publication convertFromNode(Node node){
+ private Publication convertFromNode(Node node) {
return MMBaseNodeMapper.copyNode(node, Publication.class);
}
-
protected String getNewsletterPath(Node newsletterPublicationNode) {
return NavigationUtil.getPathToRootString(newsletterPublicationNode,
true);
}
-
public Set<Term> getTermsByPublication(int publicationId) {
Node newsletterPublicationNode = cloud.getNode(publicationId);
NodeList relatedNewsletters =
newsletterPublicationNode.getRelatedNodes("newsletter");
@@ -156,67 +169,27 @@
String oldTitle = publicationNode.getStringValue("title");
String newTile = oldTitle;
String dateTime = "";
- if(oldTitle.length() > 18) {
- dateTime = oldTitle.substring(oldTitle.length()-16);
+ if (oldTitle.length() > 18) {
+ dateTime = oldTitle.substring(oldTitle.length() - 16);
}
- if(dateTime.indexOf("-") > 0 && dateTime.indexOf(":") > 0){
- newTile = oldTitle.substring(0,oldTitle.length()-18);
+ if (dateTime.indexOf("-") > 0 && dateTime.indexOf(":") > 0) {
+ newTile = oldTitle.substring(0, oldTitle.length() - 18);
}
- publicationNode.setStringValue("title", newTile+" "+now);
+ publicationNode.setStringValue("title", newTile + " " + now);
publicationNode.commit();
}
-// public Set<Publication> getPublicationsByNewsletterAndPeriod(int
newsletterId, String title, String subject, Date startDate, Date endDate, int
pagesize, int offset){
-// NodeManager manager = cloud.getNodeManager("newsletterpublication");
-// Node newsletterNode = cloud.getNode(newsletterId);
-//
-// NodeQuery nodeQuery =
SearchUtil.createRelatedNodeListQuery(newsletterNode, "newsletterpublication",
"related");
-// Step step = nodeQuery.getNodeStep();
-//
-// StepField fieldSubject = nodeQuery.addField(step,
manager.getField("subject"));
-// StepField fieldTitle = nodeQuery.addField(step,
manager.getField("title"));
-// StepField fieldDate = nodeQuery.addField(step,
manager.getField("creationdate"));
-//
-// BasicFieldValueConstraint constraintTitle = new
BasicFieldValueConstraint(fieldTitle, "%" + title + "%");
-// constraintTitle.setOperator(FieldCompareConstraint.LIKE);
-// BasicFieldValueConstraint constraintSubject = new
BasicFieldValueConstraint(fieldSubject, "%" + subject + "%");
-// constraintSubject.setOperator(FieldCompareConstraint.LIKE);
-//
-// BasicCompositeConstraint constraints = new
BasicCompositeConstraint(2);
-// if (startDate != null){
-// BasicFieldValueBetweenConstraint constraintDate= new
BasicFieldValueBetweenConstraint(fieldDate, startDate, endDate);
-// constraints.addChild(constraintDate);
-// }
-// else{
-// BasicFieldValueConstraint constraintDate =new
BasicFieldValueConstraint(fieldDate, endDate);
-// constraintDate.setOperator(FieldCompareConstraint.LESS);
-// constraints.addChild(constraintDate);
-// }
-//
-// constraints.addChild(constraintTitle);
-// constraints.addChild(constraintSubject);
-// nodeQuery.setOffset(offset);
-// nodeQuery.setMaxNumber(pagesize);
-// nodeQuery.setConstraint(constraints);
-// List<Node> list = nodeQuery.getList();
-// Set<Publication> publications = convertPublicationsToMap(list);
-// return publications;
-// }
private List<Publication> convertPublicationsToMap(List<Node>
publicationNodes) {
List<Publication> publications = new ArrayList<Publication>();
- // private Set<Publication> convertPublicationsToMap(List<Node>
- // publicationNodes) {
- // Set<Publication> publications = new HashSet<Publication>();
- // >>>>>>> 1.15
for (Node publicationNode : publicationNodes) {
publications.add(convertFromNode(publicationNode));
}
return publications;
}
- public int getPublicationCountForEdit(int newsletterId, String title,
String subject, Date startDate, Date endDate){
+ public int getPublicationCountForEdit(int newsletterId, String title,
String subject, Date startDate, Date endDate) {
NodeManager manager =
cloud.getNodeManager("newsletterpublication");
Node newsletterNode = cloud.getNode(newsletterId);
@@ -233,11 +206,11 @@
constraintSubject.setOperator(FieldCompareConstraint.LIKE);
BasicCompositeConstraint constraints = new
BasicCompositeConstraint(2);
- if (startDate != null){
- BasicFieldValueBetweenConstraint constraintDate= new
BasicFieldValueBetweenConstraint(fieldDate, startDate, endDate);
+ if (startDate != null) {
+ BasicFieldValueBetweenConstraint constraintDate = new
BasicFieldValueBetweenConstraint(fieldDate, startDate, endDate);
constraints.addChild(constraintDate);
} else {
- BasicFieldValueConstraint constraintDate =new
BasicFieldValueConstraint(fieldDate, endDate);
+ BasicFieldValueConstraint constraintDate = new
BasicFieldValueConstraint(fieldDate, endDate);
constraintDate.setOperator(FieldCompareConstraint.LESS);
constraints.addChild(constraintDate);
}
@@ -289,5 +262,4 @@
return publications;
}
-
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
