You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/08/04 20:25:30 UTC
svn commit: r428820 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering:
model/FeedModel.java model/PlanetModel.java model/SiteModel.java
servlets/FeedServlet.java
Author: snoopdave
Date: Fri Aug 4 11:25:29 2006
New Revision: 428820
URL: http://svn.apache.org/viewvc?rev=428820&view=rev
Log:
Site and feed models can exist without WeblogPageRequest
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.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=428820&r1=428819&r2=428820&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 Fri Aug 4 11:25:29 2006
@@ -41,7 +41,6 @@
/**
* Model which provides information needed to render a feed.
- * Returns site-wide feeds when weblog is a
*/
public class FeedModel implements Model {
@@ -123,7 +122,7 @@
Roller roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
List entries = wmgr.getWeblogEntries(
- RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle()) ? null : weblog,
+ weblog,
null,
null,
new Date(),
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java?rev=428820&r1=428819&r2=428820&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PlanetModel.java Fri Aug 4 11:25:29 2006
@@ -29,11 +29,13 @@
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.PlanetSubscriptionData;
+import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.pojos.wrapper.PlanetSubscriptionDataWrapper;
import org.apache.roller.ui.rendering.pagers.Pager;
import org.apache.roller.ui.rendering.pagers.PlanetEntriesPager;
import org.apache.roller.ui.rendering.util.WeblogPageRequest;
+import org.apache.roller.ui.rendering.util.WeblogRequest;
/**
@@ -41,7 +43,9 @@
*/
public class PlanetModel implements Model {
- private WeblogPageRequest pageRequest = null;
+ private WeblogRequest weblogRequest = null;
+ private WeblogTemplate weblogPage = null;
+ private int pageNum = 0;
protected WebsiteData weblog = null;
private static Log log = LogFactory.getLog(PlanetModel.class);
@@ -53,13 +57,17 @@
public void init(Map initData) throws RollerException {
// we expect the init data to contain a pageRequest object
- this.pageRequest = (WeblogPageRequest) initData.get("pageRequest");
- if(this.pageRequest == null) {
+ this.weblogRequest = (WeblogPageRequest) initData.get("pageRequest");
+ if(this.weblogRequest == null) {
throw new RollerException("expected pageRequest from init data");
}
-
+ // TODO 3.0: is it better to reparse URL to get these?
+ if (weblogRequest instanceof WeblogPageRequest) {
+ weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
+ pageNum = ((WeblogPageRequest)weblogRequest).getPageNum();
+ }
// extract weblog object
- weblog = pageRequest.getWeblog();
+ weblog = weblogRequest.getWeblog();
}
@@ -74,10 +82,10 @@
null,
null,
weblog,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
sinceDays,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
@@ -93,10 +101,10 @@
null,
groupHandle,
weblog,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
sinceDays,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
@@ -112,10 +120,10 @@
feedURL,
null,
weblog,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
-1,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java?rev=428820&r1=428819&r2=428820&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java Fri Aug 4 11:25:29 2006
@@ -35,6 +35,7 @@
import org.apache.roller.model.WeblogManager;
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.pojos.wrapper.UserDataWrapper;
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
@@ -44,6 +45,7 @@
import org.apache.roller.ui.rendering.pagers.WeblogEntriesListPager;
import org.apache.roller.ui.rendering.pagers.WeblogsPager;
import org.apache.roller.ui.rendering.util.WeblogPageRequest;
+import org.apache.roller.ui.rendering.util.WeblogRequest;
/**
@@ -51,9 +53,11 @@
*/
public class SiteModel implements Model {
- private WeblogPageRequest pageRequest = null;
protected WebsiteData weblog = null;
- private static Log log = LogFactory.getLog(SiteModel.class);
+ private WeblogRequest weblogRequest = null;
+ private WeblogTemplate weblogPage = null;
+ private int pageNum = 0;
+ private static Log log = LogFactory.getLog(SiteModel.class);
public String getModelName() {
return "site";
@@ -61,13 +65,17 @@
public void init(Map initData) throws RollerException {
// we expect the init data to contain a pageRequest object
- this.pageRequest = (WeblogPageRequest) initData.get("pageRequest");
- if(this.pageRequest == null) {
+ this.weblogRequest = (WeblogPageRequest) initData.get("weblogRequest");
+ if(this.weblogRequest == null) {
throw new RollerException("expected pageRequest from init data");
}
-
+ // TODO 3.0: is it better to reparse URL to get these?
+ if (weblogRequest instanceof WeblogPageRequest) {
+ weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
+ pageNum = ((WeblogPageRequest)weblogRequest).getPageNum();
+ }
// extract weblog object
- weblog = pageRequest.getWeblog();
+ weblog = weblogRequest.getWeblog();
}
//----------------------------------------------------------------- Pagers
@@ -80,10 +88,10 @@
public Pager getWeblogEntriesPager(int sinceDays, int length) {
return new WeblogEntriesListPager(
weblog, null, null, null,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
sinceDays,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
@@ -100,10 +108,10 @@
public Pager getWeblogEntriesPager(WebsiteData queryWeblog, UserData user, String cat, int sinceDays, int length) {
return new WeblogEntriesListPager(
weblog, queryWeblog, user, cat,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
sinceDays,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
@@ -117,10 +125,10 @@
public Pager getCommentsPager(int sinceDays, int length) {
return new CommentsPager(
weblog,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
sinceDays,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
@@ -130,10 +138,10 @@
return new UsersPager(
letter,
weblog,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
sinceDays,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
@@ -143,10 +151,10 @@
return new WeblogsPager(
letter,
weblog,
- pageRequest.getWeblogPage(),
- pageRequest.getLocale(),
+ weblogPage,
+ weblogRequest.getLocale(),
sinceDays,
- pageRequest.getPageNum(),
+ pageNum,
length);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?rev=428820&r1=428819&r2=428820&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Fri Aug 4 11:25:29 2006
@@ -194,11 +194,10 @@
// Load special models for site-wide blog
- // TODO 3.0 decide what do do about site models in feeds
- //if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
- // String siteModels = RollerConfig.getProperty("rendering.siteModels");
- // ModelLoader.loadModels(siteModels, model, initData, true);
- //}
+ if(RollerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+ String siteModels = RollerConfig.getProperty("rendering.siteModels");
+ ModelLoader.loadModels(siteModels, model, initData, true);
+ }
// Load weblog custom models
ModelLoader.loadCustomModels(weblog, model, initData);