svn commit: r421743 - /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java

[ag...@apache.org]

Author: agilliland
Date: Thu Jul 13 16:49:19 2006
New Revision: 421743

URL: http://svn.apache.org/viewvc?rev=421743&view=rev
Log:
make sure feed entry count doesn't exceed site limit.


Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java?rev=421743&r1=421742&r2=421743&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java Thu Jul 13 16:49:19 2006
@@ -23,13 +23,12 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.model.Roller;
 import org.apache.roller.model.RollerFactory;
-import org.apache.roller.model.UserManager;
 import org.apache.roller.model.WeblogManager;
 import org.apache.roller.pojos.CommentData;
 import org.apache.roller.pojos.WeblogEntryData;
@@ -89,6 +88,17 @@
      * request plus the weblog.entryDisplayCount.
      */
     public List getWeblogEntries() {
+        // Display same number of entries in feed as displayed on page
+        int entryCount = weblog.getEntryDisplayCount();
+        
+        // But don't exceed installation-wide maxEntries settings
+        int maxEntries =
+                RollerRuntimeConfig.getIntProperty("site.newsfeeds.maxEntries");
+        int defaultEntries =
+                RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
+        if (entryCount < 1) entryCount = defaultEntries;
+        if (entryCount > maxEntries) entryCount = maxEntries;
+        
         List results = new ArrayList();
         try {             
             Roller roller = RollerFactory.getRoller();
@@ -102,7 +112,7 @@
                     "pubTime", 
                     feedRequest.getLocale(), 
                     0, 
-                    weblog.getEntryDisplayCount());
+                    entryCount);
             for (Iterator it = entries.iterator(); it.hasNext();) {
                 WeblogEntryData entry = (WeblogEntryData) it.next();
                 results.add(WeblogEntryDataWrapper.wrap(entry));