Merge pull request #325 from vubiostat/cran-release-318

Changes required by win-builder devel #318

R/documentation-common-args.R

@@ -40,9 +40,9 @@ NULL
 #' @param na  A named `list` of user specified functions to determine if the
 #'   data is NA. This is useful when data is loaded that has coding for NA, e.g.
 #'   -5 is NA. Keys must correspond to a truncated REDCap field type, i.e.
-#'   {date_, datetime_, datetime_seconds_, time_mm_ss, time_hh_mm_ss, time, float,
+#'   date_, datetime_, datetime_seconds_, time_mm_ss, time_hh_mm_ss, time, float,
 #'   number, calc, int, integer, select, radio, dropdown, yesno, truefalse,
-#'   checkbox, form_complete, sql, system}. The function will be provided the 
+#'   checkbox, form_complete, sql, system. The function will be provided the 
 #'   variables (x, field_name, coding). The function must return a vector of 
 #'   logicals matching the input. It defaults to [isNAorBlank()] for all
 #'   entries.
@@ -61,7 +61,7 @@ NULL
 #' @param assignment A named `list` of functions. These functions are provided, field_name,
 #'   label, description and field_type and return a list of attributes to assign
 #'   to the column. Defaults to creating a label attribute from the stripped
-#'   HTML and UNICODE raw label and scanning for units={"UNITS"} in description
+#'   HTML and UNICODE raw label and scanning for units=\{"UNITS"\} in description
 
 NULL
 

R/makeApiCall.R

@@ -260,8 +260,15 @@ makeApiCall <- function(rcon,
 }
 
 # Helper function to convert responses to character strings without crashing.
-as.data.frame.response <- function(x, stringsAsFactors=FALSE, na.strings = "", ...)
+as.data.frame.response <- function(x, row.names=NULL, optional=FALSE, ...)
 {
+  # Setting defaults, necessary because cannot change S3 interface
+  extra <- list(...)
+  stringsAsFactors <- extra$stringsAsFactors
+  if(is.null(stringsAsFactors)) stringsAsFactors <- FALSE
+  na.strings <- extra$na.strings
+  if(is.null(na.strings)) na.strings <- ""
+
   enc <- if(grepl("charset", x$headers[["Content-Type"]]))
     toupper(sub('.*charset=([^;]+).*', '\\1', x$headers[["Content-Type"]])) else
     'ISO-8859-1' # [Default if unspecified](https://www.w3.org/International/articles/http-charset/index)