commit 68170950e8635e056a07d323cecdcf6523611024
author Marc Kupietz <kupietz@ids-mannheim.de> Wed Jun 30 09:37:21 2021 +0200
committer Marc Kupietz <kupietz@ids-mannheim.de> Wed Jul 14 18:29:07 2021 +0200
tree 6cba5e0cb951bd88744e013e95720b6e85058efd
parent 9f3356d66fe1b38821692594803bf9c9698740ee

Don't let KorAP recalculate total results in every page request

... by setting cutoff=true

Resolves #1

Change-Id: I6f104c4e7c416ebbd9173b38c236cdb85c86c82c

R/KorAPQuery.R

diff --git a/R/KorAPQuery.R b/R/KorAPQuery.R
index fee5ac1..15c742c 100644
--- a/R/KorAPQuery.R
+++ b/R/KorAPQuery.R
@@ -243,8 +243,12 @@
   collectedMatches <- kqo@collectedMatches
 
   repeat {
-    res <- apiCall(kqo@korapConnection, paste0(kqo@requestUrl, '&count=', min(if (!is.na(maxFetch)) maxFetch - results else maxResultsPerPage, maxResultsPerPage) ,'&offset=', offset + results))
-    if (res$meta$totalResults == 0) { return(kqo) }
+    query <- paste0(kqo@requestUrl, '&count=', min(if (!is.na(maxFetch)) maxFetch - results else maxResultsPerPage, maxResultsPerPage) ,'&offset=', offset + results, '&cutoff=true')
+    res <- apiCall(kqo@korapConnection, query)
+    if (length(res$matches) == 0) {
+      break
+    }
+
     for (field in kqo@fields) {
       if (!field %in% colnames(res$matches)) {
         res$matches[, field] <- NA
@@ -266,24 +270,24 @@
       collectedMatches <- rbind(collectedMatches, currentMatches)
     }
     if (verbose) {
-      cat(paste0("Retrieved page ", page, "/", ceiling((res$meta$totalResults) / res$meta$itemsPerPage), ' in ', res$meta$benchmark, '\n'))
+      cat(paste0("Retrieved page ", page, "/", ceiling((kqo@totalResults) / res$meta$itemsPerPage), ' in ', res$meta$benchmark, '\n'))
     }
     page <- page + 1
     results <- results + res$meta$itemsPerPage
-    if (offset + results >= res$meta$totalResults || (!is.na(maxFetch) && results >= maxFetch)) {
+    if (offset + results >= kqo@totalResults || (!is.na(maxFetch) && results >= maxFetch)) {
       break
     }
   }
-  nextStartIndex <- min(res$meta$startIndex + res$meta$itemsPerPage, res$meta$totalResults)
+  nextStartIndex <- min(res$meta$startIndex + res$meta$itemsPerPage, kqo@totalResults)
   KorAPQuery(nextStartIndex = nextStartIndex,
     korapConnection = kqo@korapConnection,
     fields = kqo@fields,
     requestUrl = kqo@requestUrl,
     request = kqo@request,
-    totalResults = res$meta$totalResults,
+    totalResults = kqo@totalResults,
     vc = kqo@vc,
     webUIRequestUrl = kqo@webUIRequestUrl,
-    hasMoreMatches = (res$meta$totalResults > nextStartIndex),
+    hasMoreMatches = (kqo@totalResults > nextStartIndex),
     apiResponse = res,
     collectedMatches = collectedMatches)
 })