From 0070ca99cdcb23ea57dad927d4e8c76ec9d8015a Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Fri, 12 Dec 2014 15:47:03 -0600
Subject: [PATCH] Improving error handling.
---
R/whatWQPsites.R | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/R/whatWQPsites.R b/R/whatWQPsites.R
index ecbaaa00..e370e415 100644
--- a/R/whatWQPsites.R
+++ b/R/whatWQPsites.R
@@ -75,24 +75,20 @@ whatWQPsites <- function(...){
urlCall,
"&mimeType=tsv",sep = "")
- retval = tryCatch({
+ possibleError <- tryCatch({
h <- basicHeaderGatherer()
doc <- getURL(urlCall, headerfunction = h$update)
}, warning = function(w) {
message(paste("URL caused a warning:", urlCall))
message(w)
- }, error = function(e) {
- message(paste("URL does not seem to exist:", urlCall))
- message(e)
- return(NA)
- })
-
- if(h$value()["Content-Type"] == "text/tab-separated-values;charset=UTF-8"){
+ }, error = function(e) e)
+ if(!inherits(possibleError, "error")){
+
numToBeReturned <- as.numeric(h$value()["Total-Site-Count"])
- if (!is.na(numToBeReturned) | numToBeReturned != 0){
+ if (!is.na(numToBeReturned) & numToBeReturned != 0){
retval <- read.delim(textConnection(doc), header = TRUE, quote="\"",
dec=".", sep='\t',
@@ -119,9 +115,6 @@ whatWQPsites <- function(...){
return(NA)
}
} else {
- message(paste("URL caused an error:", urlCall))
- message("Content-Type=",h$value()["Content-Type"])
- return(NA)
+ message(e)
}
-
}
--
GitLab