Author: gangolli
Date: Sun Jan 8 08:30:22 2006
New Revision: 367045
URL: http://svn.apache.org/viewcvs?rev=367045&view=rev
Log:
Fixes for ROL-988. Fix bugs in getNextEntry and getNextPrevEntries(). For the
next=true case getNextPrevEentries must be sorted ascending in order to allow a
bounded maxEntries (as used in code) on finding the next.
Modified:
incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java
incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.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=367045&r1=367044&r2=367045&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java
(original)
+++ incubator/roller/trunk/src/org/roller/business/WeblogManagerImpl.java Sun
Jan 8 08:30:22 2006
@@ -477,7 +477,7 @@
List entryList = getNextEntries(current, catName, 1);
if (entryList != null && entryList.size() > 0)
{
- entry = (WeblogEntryData)entryList.get(entryList.size()-1);
+ entry = (WeblogEntryData)entryList.get(0);
}
return entry;
}
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=367045&r1=367044&r2=367045&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
(original)
+++
incubator/roller/trunk/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
Sun Jan 8 08:30:22 2006
@@ -89,7 +89,7 @@
{
Session session = ((HibernateStrategy)mStrategy).getSession();
Criteria criteria = session.createCriteria(WeblogEntryData.class);
- criteria.addOrder(Order.desc("pubTime"));
+ criteria.addOrder(next ? Order.asc("pubTime") :
Order.desc("pubTime"));
criteria.add(conjunction);
criteria.setMaxResults(maxEntries);
List results = criteria.list();