From 013dd8e64e1a26c71a91669469d3383426036e16 Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Fri, 1 Aug 2014 16:51:42 -0500
Subject: [PATCH] Updated help and added warning
---
R/getRawQWData.r | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/R/getRawQWData.r b/R/getRawQWData.r
index ff4eb585..f647afdb 100644
--- a/R/getRawQWData.r
+++ b/R/getRawQWData.r
@@ -16,20 +16,25 @@
#' @import RCurl
#' @examples
#' # These examples require an internet connection to run
-#' rawSample <- getRawQWData('01594440','01075', '1985-01-01', '1985-03-31')
-#' rawSampleAll <- getRawQWData('05114000','', '1985-01-01', '1985-03-31')
-#' rawSampleSelect <- getRawQWData('05114000',c('00915','00931'), '1985-01-01', '1985-04-30')
+#' rawSample <- getRawQWData('USGS-01594440','01075', '1985-01-01', '1985-03-31')
+#' rawSampleAll <- getRawQWData('USGS-05114000','', '1985-01-01', '1985-03-31')
+#' rawSampleSelect <- getRawQWData('USGS-05114000',c('00915','00931'), '1985-01-01', '1985-04-30')
+#' rawStoret <- getRawQWData('WIDNR_WQX-10032762','Specific conductance', '', '')
getRawQWData <- function(siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE){
url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"wqp",interactive=interactive)
-# require(RCurl)
+
h <- basicHeaderGatherer()
doc <- getURI(url, headerfunction = h$update)
numToBeReturned <- as.numeric(h$value()["Total-Result-Count"])
- suppressWarnings(retval <- read.delim(url, 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)
+ if (!is.na(numToBeReturned) | numToBeReturned != 0){
+ suppressWarnings(retval <- read.delim(url, 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")
+ }
}
--
GitLab