more robust error msg

Author: stevencarlislewalker

R/iidda.api/R/bindings.R

@@ -25,17 +25,21 @@ production = NULL
 
 handle_iidda_response <- function(x) {
     if (x$status_code == 400L) {
-      api_err_msg = unlist(httr::content(x)$detail
-        , use.names = FALSE
-        , recursive = TRUE
-      )
-      err_tmplt = "The IIDDA API returned the following error:\n    %s\nThis documentation might be of interest:\n    %s"
-      err_msg = sprintf(err_tmplt, api_err_msg, iidda.api::docs_url_staging)
-      stop(err_msg)
+      response_content = httr::content(x)
+      if ("detail" %in% names(response_content)) { ## condition needed because 400s can originate outside of the iidda api
+        api_err_msg = unlist(response_content$detail
+          , use.names = FALSE
+          , recursive = TRUE
+        )
+        err_tmplt = "The IIDDA API returned the following error:\n    %s\nThis documentation might be of interest:\n    %s"
+        err_msg = sprintf(err_tmplt, api_err_msg, iidda.api::docs_url_staging)
+        stop(err_msg)
+      }
     } else if (x$status_code == 404L) {
       msg = sprintf("404 Not Found. The requested URL was not found on the server. If you entered the URL manually please check your spelling and try again. This documentation might be of interest:\n    %s", iidda.api::docs_url_staging)
       stop(msg)
-    } else if (x$status_code != 200L) {
+    }
+    if (x$status_code != 200L) {
       err_tmplt = "Something went wrong with the IIDDA API.\nStatus code: %s\nRequest URL: %s\nThis documentation might be of interest:\n    %s"
       err_msg = sprintf(err_tmplt, x$status_code, x$url, iidda.api::docs_url_staging)
       stop(err_msg)

R/iidda.api/R/parse.R

@@ -3,10 +3,11 @@ set_dict_names = function(x) {
 }
 get_dict = function() {
   dict = suppressWarnings({iidda.api::ops_staging$data_dictionary()})
+  #"https://raw.githubusercontent.com/canmod/iidda/main/global-metadata/data-dictionary.json"
   set_dict_names(dict)
 }
 
-## converted to messager objects in zzz.R
+## converted to message objects in zzz.R
 messages = list(
   conversion = list(
     "Now converting some fields from character to numeric or date. ",

R/iidda.api/vignettes/Provenance.Rmd

@@ -14,7 +14,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-In this vignette we illustrate how to investigate the provenance of a particular record in the a dataset obtained from the API. We use an example of a surprisingly late smallpox record in the CANMOD data.
+In this vignette we illustrate how to investigate the provenance of a particular record in the a dataset obtained from the API. We use an example of a surprisingly late smallpox record in the CANDID data.
 
 ![](images/Smallpox_virus_virions_TEM_PHIL_1849.JPG){width="60%"}