commit a96537ff9bed6c1682de5f7e625210f82a92b847
author Marc Kupietz <kupietz@ids-mannheim.de> Sat Nov 09 23:07:44 2019 +0100
committer Marc Kupietz <kupietz@ids-mannheim.de> Thu Nov 14 13:33:26 2019 +0100
tree d068b791628196e96d08bc3f79abd2e6dbb9712b
parent 1b69abf2b31a2af0a4e91f2e2133d173dea53ae4

Get rid of unnecessary ifelses

Change-Id: Ifb1c9013b2c8be7363f216adbb2dab1c08f517eb

R/KorAPConnection.R

diff --git a/R/KorAPConnection.R b/R/KorAPConnection.R
index 70a7f97..dd796b8 100644
--- a/R/KorAPConnection.R
+++ b/R/KorAPConnection.R
@@ -79,6 +79,7 @@
             .Object
           })
 
+
 apiTokenServiceName <- "RKorAPClientAPIToken"
 
 setGeneric("persistApiToken", function(kco, apiToken) standardGeneric("persistApiToken") )
@@ -157,15 +158,17 @@
   }
   parsed <- jsonlite::fromJSON(content(resp, "text"))
   if (!is.null(parsed$warnings)) {
-    message <- ifelse (nrow(parsed$warnings) > 1,
-                       sapply(parsed$warnings, function(warning) paste(sprintf("%s: %s", warning[1], warning[2]), sep="\n")),
-                       sprintf("%s: %s", parsed$warnings[1], parsed$warnings[2]))
+    message <- if (nrow(parsed$warnings) > 1)
+      sapply(parsed$warnings, function(warning) paste(sprintf("%s: %s", warning[1], warning[2]), sep="\n"))
+    else
+      sprintf("%s: %s", parsed$warnings[1], parsed$warnings[2])
     warning(message, call. = FALSE)
   }
   if (status_code(resp) != 200) {
-    message <- ifelse (!is.null(parsed$errors),
-                       sapply(parsed$errors, function(error) paste0(sprintf("\n%s: KorAP API request failed: %s", error[1], error[2]))),
-                       message <- sprintf("%s: KorAP API request failed.", status_code(resp)))
+    message <- if (!is.null(parsed$errors))
+                 sapply(parsed$errors, function(error) paste0(sprintf("\n%s: KorAP API request failed: %s", error[1], error[2])))
+               else
+                 message <- sprintf("%s: KorAP API request failed.", status_code(resp))
     stop(message, call. = FALSE)
   }
   if (kco@cache) {