Fix for pagination issue #15

SpringDataElasticsearchDevs · Mar 20, 2013 · 7853e3d · 7853e3d
1 parent c78bfc0
commit 7853e3d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
@@ -267,10 +267,10 @@ public <T> Page<T> moreLikeThis(MoreLikeThisQuery query, Class<T> clazz) {
                 client.prepareMoreLikeThis(indexName,type, query.getId());
 
         if(query.getPageable() != null){
-            startRecord = ((query.getPageable().getPageNumber() - 1) * query.getPageable().getPageSize());
+            startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();
             requestBuilder.setSearchSize(query.getPageable().getPageSize());
         }
-        requestBuilder.setSearchFrom(startRecord < 0 ? 0 : startRecord);
+        requestBuilder.setSearchFrom(startRecord);
 
         if(isNotEmpty(query.getSearchIndices())){
             requestBuilder.setSearchIndices(toArray(query.getSearchIndices()));
@@ -363,10 +363,10 @@ private SearchRequestBuilder prepareSearch(Query query){
                 .setTypes(toArray(query.getTypes()));
 
         if(query.getPageable() != null){
-            startRecord = ((query.getPageable().getPageNumber() - 1) * query.getPageable().getPageSize());
+            startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();
             searchRequestBuilder.setSize(query.getPageable().getPageSize());
         }
-        searchRequestBuilder.setFrom(startRecord < 0 ? 0 : startRecord);
+        searchRequestBuilder.setFrom(startRecord);
 
 
         if(!query.getFields().isEmpty()){