[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl NewsletterSubscriptionCAOImpl.java

[mguo]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory 
james.mmbase.org:/tmp/cvs-serv23236/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl

Modified Files:
        NewsletterSubscriptionCAOImpl.java 
Log Message:
CMSC-888 fix.


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-888


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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterSubscriptionCAOImpl.java  5 May 2008 02:40:11 -0000       1.17
+++ NewsletterSubscriptionCAOImpl.java  7 May 2008 02:54:40 -0000       1.18
@@ -8,12 +8,14 @@
 import com.finalist.newsletter.domain.Term;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+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 static com.finalist.newsletter.util.NewsletterSubscriptionUtil.*;
+
 import java.util.*;
 
 public class NewsletterSubscriptionCAOImpl extends AbstractCAO implements 
NewsletterSubscriptionCAO {
@@ -187,7 +189,6 @@
    }
 
   
-
    public void createSubscription(int userId, int newsletterId) {
       log.debug("Create subscription user:" + userId + " newsletter:" + 
newsletterId);
 
@@ -219,24 +220,26 @@
 
    public void updateSubscription(Subscription subscription) {
       Node node = cloud.getNode(subscription.getId());
-      node.setStringValue("status",subscription.getStatus().toString());
-      node.setDateValue("pausetill",subscription.getPausedTill());
+      node.setStringValue("status", subscription.getStatus().toString());
+      node.setDateValue("pausetill", subscription.getPausedTill());
       node.commit();
 
    }
 
-   public List<Subscription> getSubscriptionByUserIdAndStatus(int 
userId,STATUS status) {
+   public List<Subscription> getSubscriptionByUserIdAndStatus(int userId, 
STATUS status) {
 
       NodeManager recordManager = cloud.getNodeManager("subscriptionrecord");
 
       Query query = recordManager.createQuery();
-      
SearchUtil.addEqualConstraint(query,recordManager.getField("status"),status.toString());
-      
SearchUtil.addEqualConstraint(query,recordManager.getField("subscriber"),Integer.toString(userId));
+      if (null != status) {
+         SearchUtil.addEqualConstraint(query, 
recordManager.getField("status"), status.toString());
+      }
+      SearchUtil.addEqualConstraint(query, 
recordManager.getField("subscriber"), Integer.toString(userId));
 
       List<Node> subscriptions = query.getList();
 
       List<Subscription> subs = new ArrayList<Subscription>();
-      for(Node node :subscriptions){
+      for (Node node : subscriptions) {
          subs.add(convertFromNode(node));
       }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs