Try to match initial offset behaviour

Materials-Consortia · Mar 14, 2023 · e424b05 · e424b05
1 parent 989e0ee
commit e424b05
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/optimade/server/entry_collections/elasticsearch.py b/optimade/server/entry_collections/elasticsearch.py
@@ -195,7 +195,8 @@ def _run_db_query(
             search = search.extra(search_after=page_above, limit=limit)
 
         else:
-            search = search[:limit]
+            search = search[0:limit]
+            page_offset = 0
 
         search = search.extra(track_total_hits=True)
         response = search.execute()
@@ -204,7 +205,7 @@ def _run_db_query(
 
         if not single_entry:
             data_returned = response.hits.total.value
-            if page_offset:
+            if page_offset is not None:
                 more_data_available = page_offset + limit < data_returned
             else:
                 # Needs to be set by some custom elastic query: is the ID the last ID?