commit f6f71317ee0a711a81fc8d37a3279ebcc7d87f0f
author Marc Kupietz <kupietz@ids-mannheim.de> Mon Sep 23 18:35:27 2019 +0200
committer Marc Kupietz <kupietz@ids-mannheim.de> Mon Sep 23 18:35:27 2019 +0200
tree 062496546f8c946070d8864c94822ce9af5c4c46
parent 6898901414511e7ad8149dd58d8ab1a673c01198

Harmonize verbose handling

Change-Id: I6fd2dcadd4742f41ae747b0b0cda1c3fa1171e74

R/KorAPQuery.R

diff --git a/R/KorAPQuery.R b/R/KorAPQuery.R
index 28c508e..24a03cb 100644
--- a/R/KorAPQuery.R
+++ b/R/KorAPQuery.R
@@ -183,7 +183,7 @@
 #' @aliases fetchNext
 #' @rdname KorAPQuery-class
 #' @export
-setMethod("fetchNext", "KorAPQuery", function(kqo, offset = kqo@nextStartIndex, maxFetch = maxResultsPerPage, verbose = FALSE) {
+setMethod("fetchNext", "KorAPQuery", function(kqo, offset = kqo@nextStartIndex, maxFetch = maxResultsPerPage, verbose = kqo@korapConnection@verbose) {
   if (kqo@totalResults == 0 || offset >= kqo@totalResults) {
     return(kqo)
   }
@@ -211,7 +211,7 @@
       collectedMatches <- rbind(collectedMatches, currentMatches)
     }
     if (verbose) {
-      cat(paste0("Retrieved page: ", page, "/", ceiling((res$meta$totalResults) / res$meta$itemsPerPage), ': ', res$meta$benchmark, '\n'))
+      cat(paste0("Retrieved page ", page, "/", ceiling((res$meta$totalResults) / res$meta$itemsPerPage), ' in ', res$meta$benchmark, '\n'))
     }
     page <- page + 1
     results <- results + res$meta$itemsPerPage
@@ -242,7 +242,7 @@
 #' @aliases fetchAll
 #' @rdname KorAPQuery-class
 #' @export
-setMethod("fetchAll", "KorAPQuery", function(kqo, verbose = FALSE) {
+setMethod("fetchAll", "KorAPQuery", function(kqo, verbose = kqo@korapConnection@verbose) {
   return(fetchNext(kqo, offset = 0, maxFetch = NA, verbose = verbose))
 })
 
@@ -255,7 +255,7 @@
 #' @aliases fetchRest
 #' @rdname KorAPQuery-class
 #' @export
-setMethod("fetchRest", "KorAPQuery", function(kqo, verbose = FALSE) {
+setMethod("fetchRest", "KorAPQuery", function(kqo, verbose = kqo@korapConnection@verbose) {
   return(fetchNext(kqo, maxFetch = NA, verbose = verbose))
 })
 

man/KorAPQuery-class.Rd

diff --git a/man/KorAPQuery-class.Rd b/man/KorAPQuery-class.Rd
index c1fc185..0c37bca 100644
--- a/man/KorAPQuery-class.Rd
+++ b/man/KorAPQuery-class.Rd
@@ -23,11 +23,13 @@
   collectedMatches = NULL)
 
 \S4method{fetchNext}{KorAPQuery}(kqo, offset = kqo@nextStartIndex,
-  maxFetch = maxResultsPerPage, verbose = FALSE)
+  maxFetch = maxResultsPerPage, verbose = kqo@korapConnection@verbose)
 
-\S4method{fetchAll}{KorAPQuery}(kqo, verbose = FALSE)
+\S4method{fetchAll}{KorAPQuery}(kqo,
+  verbose = kqo@korapConnection@verbose)
 
-\S4method{fetchRest}{KorAPQuery}(kqo, verbose = FALSE)
+\S4method{fetchRest}{KorAPQuery}(kqo,
+  verbose = kqo@korapConnection@verbose)
 
 \method{format}{KorAPQuery}(x, ...)