Merge pull request #114 from ecolabdata/fix/search-off-by-one

isomorphe/geonetwork.py

@@ -132,9 +132,9 @@ def info(self):
     def get_records(self, query: dict[str, Any] | None = None) -> list[Record]:
         params = self._search_params(query)
         records = []
-        to = 0
+        from_pos = 0
         while True:
-            hits = self._search_hits(params, from_pos=to + 1)
+            hits = self._search_hits(params, from_pos=from_pos)
             if not hits:
                 break
             recs = []
@@ -146,7 +146,7 @@ def get_records(self, query: dict[str, Any] | None = None) -> list[Record]:
                 else:
                     log.debug(f"Skipping empty record: {hit}")
             records += recs
-            to += len(hits)
+            from_pos += len(hits)
         return records
 
     @abc.abstractmethod
@@ -386,7 +386,7 @@ def _search_hits(self, params: dict[str, Any], from_pos: int) -> list[dict[str,
         r = self.session.get(
             f"{self.api}/q",
             headers={"Accept": "application/json"},
-            params=params | {"from": from_pos},
+            params=params | {"from": from_pos + 1},  # v3 'from' param starts at 1
         )
         r.raise_for_status()
         rsp = r.json()

tests/test_gn_client.py

@@ -154,7 +154,7 @@ def test_get_records_v4(requests_mock: requests_mock.Mocker):
             "isTemplate",
             "mdStatus",
         ],
-        "from": 1,
+        "from": 0,
     }