doofinder/helpapp#3684 making sure scroll_id is always the last

doofinder · Apr 1, 2016 · 9f55fb9 · 9f55fb9
1 parent e145f36
commit 9f55fb9
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/doofinder_management_api.php b/lib/doofinder_management_api.php
@@ -374,14 +374,18 @@ function __construct($searchEngine, $dType){
         $this->searchEngine = $searchEngine;
     }
 
-    function rewind() {
+    private function fetchResults(){
         $apiResults = $this->searchEngine->getScrolledItemsPage($this->dType);
         $this->total = $apiResults['total'];
         $this->resultsPage = $apiResults['results'];
         $this->scrollId = $apiResults['scroll_id'];
         $this->currentItem = each($this->resultsPage);
     }
 
+    function rewind() {
+        $this->fetchResults();
+    }
+
     function valid(){
         print "\nValid? ".$this->position.", ".$this->total;
         return $this->position < $this->total;
@@ -399,9 +403,7 @@ function next(){
         ++$this->position;
         $this->currentItem = each($this->resultsPage);
         if(!$this->currentItem and $this->position < $this->total){
-            $this->resultsPage = $this->searchEngine->getScrolledItemsPage(
-                $this->dType, $this->scrollId
-            )['results'];
+            $this->fetchResults();
             $this->currentItem = each($this->resultsPage);
         }
     }