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 2005/12/05 19:32:11 UTC
svn commit: r354120 - in /incubator/roller/trunk/src/org/roller: business/
business/hibernate/ model/ pojos/ presentation/velocity/
presentation/weblog/actions/
Author: snoopdave
Date: Mon Dec 5 10:32:00 2005
New Revision: 354120
URL: http://svn.apache.org/viewcvs?rev=354120&view=rev
Log:
Need ability to specify comment ordering
Modified:
incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java
incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
incubator/roller/trunk/src/org/roller/model/WeblogManager.java
incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java
incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java
incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CommentManagementAction.java
Modified: incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java?rev=354120&r1=354119&r2=354120&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java Mon Dec 5 10:32:00 2005
@@ -230,6 +230,7 @@
null, // pending
null, // approved
null, // spam
+ true, // reverse chrono order (not that it matters)
0, // offset
-1); // no limit
for (int i=comments.size()-1; i>=0; i--) {
Modified: incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java?rev=354120&r1=354119&r2=354120&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java Mon Dec 5 10:32:00 2005
@@ -674,6 +674,7 @@
Boolean pending,
Boolean approved,
Boolean spam,
+ boolean reverseChrono,
int offset,
int length
) throws RollerException {
@@ -720,7 +721,11 @@
criteria.setMaxResults(offset + length);
}
- criteria.addOrder(Order.desc("postTime"));
+ if (reverseChrono) {
+ criteria.addOrder(Order.desc("postTime"));
+ } else {
+ criteria.addOrder(Order.asc("postTime"));
+ }
List comments = criteria.list();
if (offset==0 || comments.size() < offset) {
Modified: incubator/roller/trunk/src/org/roller/model/WeblogManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/model/WeblogManager.java?rev=354120&r1=354119&r2=354120&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/model/WeblogManager.java (original)
+++ incubator/roller/trunk/src/org/roller/model/WeblogManager.java Mon Dec 5 10:32:00 2005
@@ -152,6 +152,7 @@
* @param endDate End date or null for no restriction
* @param pending Pending flag value or null for no restriction
* @param pending Approved flag value or null for no restriction
+ * @param reverseChrono True for results in reverse chrono order
* @param spam Spam flag value or null for no restriction
* @param offset Offset into results for paging
* @param length Max comments to return (or -1 for no limit)
@@ -165,6 +166,7 @@
Boolean pending,
Boolean approved,
Boolean spam,
+ boolean reverseChrono,
int offset,
int length
) throws RollerException;
Modified: incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java?rev=354120&r1=354119&r2=354120&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/WeblogEntryData.java Mon Dec 5 10:32:00 2005
@@ -667,6 +667,7 @@
null, // pending
approvedOnly ? Boolean.TRUE : null, // approved
ignoreSpam ? Boolean.FALSE : null, // spam
+ false, // we want chrono order
0, // offset
-1); // no limit
} catch (RollerException alreadyLogged) {}
Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java?rev=354120&r1=354119&r2=354120&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/PageModel.java Mon Dec 5 10:32:00 2005
@@ -830,6 +830,7 @@
null, // pending
Boolean.TRUE, // approved only
Boolean.FALSE, // no spam
+ false, // we want chrono order
0, // offset
maxCount); // no limit
Modified: incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CommentManagementAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CommentManagementAction.java?rev=354120&r1=354119&r2=354120&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CommentManagementAction.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/weblog/actions/CommentManagementAction.java Mon Dec 5 10:32:00 2005
@@ -213,6 +213,7 @@
queryForm.getPending(),
queryForm.getApproved(),
queryForm.getSpam(),
+ true, // reverse chrono order
queryForm.getOffset(),
queryForm.getCount() + 1);
if (comments.size() > queryForm.getCount()) {