Update of
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed
In directory
james.mmbase.org:/tmp/cvs-serv2326/rssfeed/src/java/com/finalist/cmsc/rssfeed
Modified Files:
Tag: b1_4
RssFeedNavigationRenderer.java
Log Message:
CMSC-1039 - RSS Feed did not use the 'max days age' field for expiry of items
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed
See also: http://www.mmbase.org/jira/browse/CMSC-1039
Index: RssFeedNavigationRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- RssFeedNavigationRenderer.java 25 Jul 2008 11:13:25 -0000 1.5.2.3
+++ RssFeedNavigationRenderer.java 27 Aug 2008 13:34:19 -0000 1.5.2.4
@@ -22,6 +22,7 @@
import org.mmbase.bridge.NodeIterator;
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.NodeQuery;
+import org.mmbase.bridge.util.SearchUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -70,6 +71,8 @@
List<String> contentTypesList = rssFeed.getContenttypes();
int contentChannelNumber = rssFeed.getContentChannel();
+ int maxAgeInDays = rssFeed.getMax_age_in_days();
+
boolean useLifecycle = true;
int maxNumber = rssFeed.getMaximum();
if (maxNumber <= 0) maxNumber = -1;
@@ -83,6 +86,10 @@
NodeQuery query =
RepositoryUtil.createLinkedContentQuery(contentChannel, contentTypesList,
ContentElementUtil.PUBLISHDATE_FIELD, "down", useLifecycle,
null, 0, maxNumber, -1, -1, -1);
+ //Add constraint: max age in days
+ if (maxAgeInDays > 0) {
+ SearchUtil.addDayConstraint(query,
cloud.getNodeManager(RepositoryUtil.CONTENTELEMENT),
ContentElementUtil.PUBLISHDATE_FIELD, "-" + maxAgeInDays);
+ }
NodeList results = query.getNodeManager().getList(query);
for (NodeIterator ni = results.nodeIterator(); ni.hasNext();) {
Node resultNode = ni.nextNode();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
