Update of /cvsroot/roller/roller/src/org/roller/presentation/velocity
In directory sc8-pr-cvs1:/tmp/cvs-serv19645/src/org/roller/presentation/velocity
Modified Files:
ContextLoader.java PageHelper.java PageModel.java
Log Message:
* Bug fixes for Wiki related issues
* _entry page to override entry rendering
* _rss page to override RSS template
* Main branch now known as 0.9.8-dev
Index: ContextLoader.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/velocity/ContextLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ContextLoader.java 1 Jun 2003 12:41:38 -0000 1.4
--- ContextLoader.java 3 Jun 2003 03:26:49 -0000 1.5
***************
*** 263,266 ****
--- 263,267 ----
{
HttpServletRequest request = rreq.getRequest();
+
int entryLength = -1;
String sExcerpts = request.getParameter("excerpts");
***************
*** 270,273 ****
--- 271,291 ----
}
ctx.put("entryLength", new Integer(entryLength));
+
+ int entryCount = 15;
+ String sCount = request.getParameter("count");
+ if ( sCount!=null && sExcerpts.trim().equals(""))
+ {
+ try
+ {
+ entryCount = Integer.parseInt(sCount);
+ }
+ catch (NumberFormatException e)
+ {
+ mLogger.warn("Improperly formatted count parameter");
+ }
+ if ( entryCount > 50 ) entryCount = 50;
+ if ( entryCount < 0 ) entryCount = 15;
+ }
+ ctx.put("entryCount", new Integer(entryCount));
String catname = null;
Index: PageHelper.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/velocity/PageHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PageHelper.java 27 May 2003 02:50:06 -0000 1.2
--- PageHelper.java 3 Jun 2003 03:26:49 -0000 1.3
***************
*** 60,65 ****
mResponse = response;
mPageContext = rreq.getPageContext();
! mUsername = rreq.getUser().getUserName();
! mMenuModel = this.getRollerMenuModel(rreq);
}
--- 60,69 ----
mResponse = response;
mPageContext = rreq.getPageContext();
! mMenuModel = this.getRollerMenuModel(rreq);
!
! if ( rreq.getUser() != null )
! {
! mUsername = rreq.getUser().getUserName();
! }
}
Index: PageModel.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/velocity/PageModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PageModel.java 27 May 2003 00:46:30 -0000 1.1
--- PageModel.java 3 Jun 2003 03:26:49 -0000 1.2
***************
*** 74,79 ****
mPageContext = rreq.getPageContext();
mVelocityContext = ctx;
!
! mUsername = rreq.getUser().getUserName();
try
--- 74,82 ----
mPageContext = rreq.getPageContext();
mVelocityContext = ctx;
!
! if ( rreq.getUser() != null )
! {
! mUsername = rreq.getUser().getUserName();
! }
try
***************
*** 90,103 ****
*/
! // Get the pages, put into context & load map
! PageData[] pages = mUserMgr.getPages(mUsername);
! mVelocityContext.put("pages", pages);
! for (int i=0; i<pages.length; i++)
! {
! mPageMap.put(pages[i].getName(), pages[i]);
! }
!
! // Get Categories
! mCategories = mWeblogMgr.getWeblogCategories(mUsername);
}
catch (RollerException e)
--- 93,109 ----
*/
! if ( mUsername != null )
! {
! // Get the pages, put into context & load map
! PageData[] pages = mUserMgr.getPages(mUsername);
! mVelocityContext.put("pages", pages);
! for (int i=0; i<pages.length; i++)
! {
! mPageMap.put(pages[i].getName(), pages[i]);
! }
!
! // Get Categories
! mCategories = mWeblogMgr.getWeblogCategories(mUsername);
! }
}
catch (RollerException e)
***************
*** 217,220 ****
--- 223,243 ----
/** Encapsulates UserManager.getPageByName() */
+ public PageData getUsersPageByName(String userName, String pageName)
+ {
+ PageData page = null;
+ try
+ {
+ page = mUserMgr.getPageByName(userName,pageName);
+ }
+ catch (RollerException e)
+ {
+ mLogger.error("ERROR getting user's page by name");
+ }
+ return page;
+ }
+
+ //------------------------------------------------------------------------
+
+ /** Encapsulates UserManager.getPageByName() */
public PageData getPageByName(String pageName)
{
***************
*** 246,250 ****
try
{
! String name = mRollerReq.getUser().getUserName();
String dayParam = mRollerReq.getDateString(true);
String catParam = null;
--- 269,277 ----
try
{
! String name = null;
! if (mRollerReq.getUser() != null)
! {
! name = mRollerReq.getUser().getUserName();
! }
String dayParam = mRollerReq.getDateString(true);
String catParam = null;
***************
*** 274,278 ****
try
{
! String name = mRollerReq.getUser().getUserName();
Date day = mRollerReq.getDate();
String catParam = null;
--- 301,309 ----
try
{
! String name = null;
! if (mRollerReq.getUser() != null)
! {
! name = mRollerReq.getUser().getUserName();
! }
Date day = mRollerReq.getDate();
String catParam = null;
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
|
