reset the internal array to avoid miestorious positional bug

doofinder · Apr 13, 2016 · 2b5e236 · 2b5e236
1 parent 4e39c4c
commit 2b5e236
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/doofinder_management_api.php b/lib/doofinder_management_api.php
@@ -178,14 +178,16 @@ public function getScrolledItemsPage($dType, $scrollId = null) {
          * It only paginates forward. Can't go backwards
          * @param string $dType Type of the items to list
          * @param string $scrollId identifier of the pagination set
-         * @return array Assoc array with scroll_id and paginated results
+         * @return array Assoc array with scroll_id ,paginated results and total results.
          */
 
         $params = $scrollId ? array("scroll_id"=>$scrollId) : null;
+
         $result = $this->dma->managementApiCall(
             'GET', $this->hashid.'/items/'.$dType,
             $params
         );
+
         return array(
             'scroll_id' => $result['response']['scroll_id'],
             'results' => $result['response']['results'],
@@ -375,19 +377,19 @@ function __construct($searchEngine, $dType){
     }
 
     private function fetchResults(){
-        $apiResults = $this->searchEngine->getScrolledItemsPage($this->dType);
+        $apiResults = $this->searchEngine->getScrolledItemsPage($this->dType, $this->scrollId);
         $this->total = $apiResults['total'];
         $this->resultsPage = $apiResults['results'];
         $this->scrollId = $apiResults['scroll_id'];
         $this->currentItem = each($this->resultsPage);
     }
 
     function rewind() {
+        $this->scrollId = null;
         $this->fetchResults();
     }
 
     function valid(){
-        print "\nValid? ".$this->position.", ".$this->total;
         return $this->position < $this->total;
     }
 
@@ -404,6 +406,7 @@ function next(){
         $this->currentItem = each($this->resultsPage);
         if(!$this->currentItem and $this->position < $this->total){
             $this->fetchResults();
+            reset($this->resultsPage);
             $this->currentItem = each($this->resultsPage);
         }
     }