Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory james.mmbase.org:/tmp/cvs-serv25509/portlets/newsletter
Modified Files:
NewsletterContentPortlet.java
Log Message:
CMSC-743,Newsletter:send email,add term parameter to NewsletterContentPortlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-743
Index: NewsletterContentPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterContentPortlet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- NewsletterContentPortlet.java 29 Apr 2008 07:16:49 -0000 1.18
+++ NewsletterContentPortlet.java 5 May 2008 10:26:59 -0000 1.19
@@ -25,7 +25,7 @@
public class NewsletterContentPortlet extends AbstractContentPortlet {
public static final String DEFINITION = "newslettercontentportlet";
-
+ public static final String NEWSLETTER_TERMS_PARAM = "termNumbers";
protected static final String DISPLAYTYPE_PARAM = "displayType";
protected static final String USE_PAGING = "usePaging";
@@ -45,7 +45,7 @@
protected static final String TYPES = "types";
protected static final String MAX_ELEMENTS = "maxElements";
- private static final String NEWSLETTER_TERMS_PARAM = "termNumbers";
+
@Override
protected void doEditDefaults(RenderRequest request, RenderResponse
response) throws IOException, PortletException {
super.doEditDefaults(request, response);
@@ -55,7 +55,6 @@
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, java.io.IOException {
PortletPreferences preferences = request.getPreferences();
String template =
preferences.getValue(PortalConstants.CMSC_PORTLET_VIEW_TEMPLATE, null);
-
String currentPath = getUrlPath(request);
NavigationItem result =
SiteManagement.getNavigationItemFromPath(currentPath);
if (result != null) {
@@ -86,7 +85,7 @@
}
setAttribute(req, "offset", offset);
- String orderby = preferences.getValue(ARTICLES_SORT_ORDERBY, null);
+ String orderBy = preferences.getValue(ARTICLES_SORT_ORDERBY, null);
String direction = preferences.getValue(ARTICLES_SORT_DIRECTION,
null);
String useLifecycle = preferences.getValue(USE_LIFECYCLE, null);
@@ -100,7 +99,6 @@
}
elementsPerPage = Math.min(elementsPerPage, maxElements);
-
boolean useLifecycleBool =
Boolean.valueOf(useLifecycle).booleanValue();
if (useLifecycleBool && ServerUtil.isLive()) {
// A live server will remove expired nodes.
@@ -108,21 +106,20 @@
}
int totalItems = 0 ;
List<ContentElement> elements = null;
- String termNumbers = preferences.getValue(NEWSLETTER_TERMS_PARAM,
null);
+ String termNumbers = req.getParameter(NEWSLETTER_TERMS_PARAM);
if(StringUtils.isEmpty(termNumbers)) {
- totalItems = countContentElements(itemNumber);
- elements = getContentElements(itemNumber,offset,elementsPerPage,
orderby, direction);
+ totalItems = NewsletterUtil.countArticlesByNewsletter(itemNumber);
+ elements =
NewsletterUtil.getArticlesByNewsletter(itemNumber,offset,elementsPerPage,orderBy,direction);
}
else {
- totalItems = countContentElements(termNumbers);
- elements = getContentElements(termNumbers,offset,elementsPerPage,
orderby, direction);
+ totalItems = NewsletterUtil.countArticlesByNewsletter(termNumbers);
+ elements =
NewsletterUtil.getArticlesByNewsletter(termNumbers,offset,elementsPerPage,orderBy,direction);
}
if (startIndex > 0) {
totalItems = totalItems - startIndex;
}
-
setAttribute(req, ELEMENTS, elements);
if (contenttypes != null && !contenttypes.isEmpty()) {
setAttribute(req, TYPES, contenttypes);
@@ -156,27 +153,6 @@
}
}
- protected int countContentElements(int itemNumber) {
- int totalItems = NewsletterUtil.countArticlesByNewsletter(itemNumber);
-
- return totalItems;
- }
- protected int countContentElements(String termNumbers) {
- int totalItems = NewsletterUtil.countArticlesByNewsletter(termNumbers);
-
- return totalItems;
- }
- protected List<ContentElement> getContentElements(int itemNumber,int
offset,int elementsPerPage, String orderBy, String direction) {
-
- List<ContentElement> elements =
NewsletterUtil.getArticlesByNewsletter(itemNumber,offset,elementsPerPage,orderBy,direction);
- return elements;
- }
- protected List<ContentElement> getContentElements(String termNumbers,int
offset,int elementsPerPage, String orderBy, String direction) {
-
- List<ContentElement> elements =
NewsletterUtil.getArticlesByNewsletter(termNumbers,offset,elementsPerPage,orderBy,direction);
- return elements;
- }
-
public int getOffset(int currentPage, int pageSize) {
return ((currentPage - 1) * pageSize) + 1;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
