Author: ssmiweve
Date: 2008-03-04 16:14:03 +0100 (Tue, 04 Mar 2008)
New Revision: 6219
Modified:
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
Log:
SEARCH-3733 - New methods for offset
Modified:
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
===================================================================
---
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
2008-03-04 14:34:22 UTC (rev 6218)
+++
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/PagingHelper.java
2008-03-04 15:14:03 UTC (rev 6219)
@@ -14,14 +14,15 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with SESAT. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Magnus Eklund</a>
* @version $Id$
*/
package no.sesat.search.view.navigation;
+/* Immutable helper class for handling offsets.
+ *
+ **/
public final class PagingHelper {
private final int hitCount;
@@ -73,4 +74,12 @@
public int getCurrentPage() {
return offset / pageSize + 1;
}
+
+ public int getCurrentPageFromCount(){
+ return offset;
+ }
+
+ public int getCurrentPageToCount(){
+ return offset + (pageSize -1);
+ }
}
Modified:
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
===================================================================
---
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
2008-03-04 14:34:22 UTC (rev 6218)
+++
branches/2.16/view-control-spi/src/main/java/no/sesat/search/view/navigation/ResultPagingNavigationController.java
2008-03-04 15:14:03 UTC (rev 6219)
@@ -43,6 +43,8 @@
public static final String NUMBER_OF_PAGES = "numberOfPages";
public static final String FIRST_VISIBLE_PAGE = "firstVisiblePage";
public static final String LAST_VISIBLE_PAGE = "lastVisiblePage";
+ public static final String CURRENT_PAGE_FROM_COUNT =
"currentPageFromCount";
+ public static final String CURRENT_PAGE_TO_COUNT = "currentPageToCount";
private static final String MSG_PREV = "prev";
private static final String MSG_NEXT = "next";
@@ -67,7 +69,7 @@
final ResultList<? extends ResultItem> searchResult =
search.getResults();
- int hitCount;
+ final int hitCount;
if(config.getHitcountSource().length() > 0 && null !=
searchResult.getField(config.getHitcountSource())) {
hitCount =
Integer.parseInt(searchResult.getField(config.getHitcountSource()));
}else {
@@ -90,6 +92,10 @@
item.addField(FIRST_VISIBLE_PAGE,
searchResult.getField(FIRST_VISIBLE_PAGE));
searchResult.addField(LAST_VISIBLE_PAGE,
Integer.toString(pager.getLastVisiblePage()));
item.addField(LAST_VISIBLE_PAGE,
searchResult.getField(LAST_VISIBLE_PAGE));
+ searchResult.addField(CURRENT_PAGE_FROM_COUNT,
Integer.toString(pager.getCurrentPageFromCount()));
+ item.addField(CURRENT_PAGE_FROM_COUNT,
searchResult.getField(CURRENT_PAGE_FROM_COUNT));
+ searchResult.addField(CURRENT_PAGE_TO_COUNT,
Integer.toString(pager.getCurrentPageToCount()));
+ item.addField(CURRENT_PAGE_TO_COUNT,
searchResult.getField(CURRENT_PAGE_TO_COUNT));
final TextMessages messages =
TextMessages.valueOf(context.getSite());
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
