diff --git a/NAMESPACE b/NAMESPACE index c096d1c923ffc94a56f0e8c84c1a0419d4fdbb59..0d01cc166190e3c6c1d8df7328c08b2f44b5ed31 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -59,6 +59,7 @@ importFrom(dplyr,rbind_all) importFrom(dplyr,select_) importFrom(httr,GET) importFrom(httr,HEAD) +importFrom(httr,RETRY) importFrom(httr,content) importFrom(httr,headers) importFrom(httr,status_code) diff --git a/R/getWebServiceData.R b/R/getWebServiceData.R index 6473fa347b2f1b8951b39141beda126b6deee991..fada81725b57d0b85d69ef65b8c124f5f9e3ec5b 100644 --- a/R/getWebServiceData.R +++ b/R/getWebServiceData.R @@ -6,6 +6,7 @@ #' @param obs_url character containing the url for the retrieval #' @param \dots information to pass to header request #' @importFrom httr GET +#' @importFrom httr RETRY #' @importFrom httr user_agent #' @importFrom httr stop_for_status #' @importFrom httr status_code @@ -26,7 +27,7 @@ #' } getWebServiceData <- function(obs_url, ...){ - returnedList <- GET(obs_url, ..., user_agent(default_ua())) + returnedList <- RETRY("GET",obs_url, ..., user_agent(default_ua())) if(status_code(returnedList) != 200){ message("For: ", obs_url,"\n") diff --git a/R/importRDB1.r b/R/importRDB1.r index e217a5377139ad04b753552791fd836e36454332..3b82f6333efb5c26efe029b5a06efa5e419f1352 100644 --- a/R/importRDB1.r +++ b/R/importRDB1.r @@ -119,8 +119,10 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz=""){ #defaults to time in seconds in readr 0.2.2.9?? if(length(grep("hms",lapply(readr.data, class))) > 0){ colHMS <- grep("hms",lapply(readr.data, class)) - colList <- list(rep("c", length(colHMS))) + + colList <- as.list(rep("c",length(colHMS))) names(colList) <- paste0("X",colHMS) + readr.data <- suppressWarnings(read_delim(doc, skip = (meta.rows+2),delim="\t", col_names = FALSE, col_types = colList))