diff --git a/R/getWQPSites.R b/R/getWQPSites.R index bbaf5b3ad0230d1bec6d41a7343b8c86a96ebaa6..50f20f8877c6cc1ac5a99f8c763b97980de34f29 100644 --- a/R/getWQPSites.R +++ b/R/getWQPSites.R @@ -41,24 +41,31 @@ getWQPSites <- function(...){ message(paste("URL does not seem to exist:", urlCall)) message(e) return(NA) - }) + }) - numToBeReturned <- as.numeric(h$value()["Total-Site-Count"]) + if(h$value()["Content-Type"] == "text/tab-separated-values;charset=UTF-8"){ - if (!is.na(numToBeReturned) | numToBeReturned != 0){ - - retval <- read.delim(textConnection(doc), header = TRUE, quote="\"", - dec=".", sep='\t', - colClasses=c('character'), - fill = TRUE) - actualNumReturned <- nrow(retval) - - if(actualNumReturned != numToBeReturned) warning(numToBeReturned, " sample results were expected, ", actualNumReturned, " were returned") - - return(retval) + numToBeReturned <- as.numeric(h$value()["Total-Site-Count"]) + if (!is.na(numToBeReturned) | numToBeReturned != 0){ + + retval <- read.delim(textConnection(doc), header = TRUE, quote="\"", + dec=".", sep='\t', + colClasses=c('character'), + fill = TRUE) + actualNumReturned <- nrow(retval) + + if(actualNumReturned != numToBeReturned) warning(numToBeReturned, " sample results were expected, ", actualNumReturned, " were returned") + + return(retval) + + } else { + warning("No data to retrieve") + return(NA) + } } else { - warning("No data to retrieve") + message(paste("URL caused an error:", urlCall)) + message("Content-Type=",h$value()["Content-Type"]) return(NA) }