Added interaction option to retrieveNWIS functions.

R/retrieveNWISData.r

@@ -28,7 +28,7 @@
 #' rawDailyQAndTempMeanMax <- retrieveNWISData(siteNumber,c('00010','00060'), startDate, endDate, StatCd=c('00001','00003'))
 retrieveNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,StatCd="00003",format="tsv",interactive=TRUE){  
   
-  url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"dv",statCd=StatCd,format=format)
+  url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"dv",statCd=StatCd,format=format,interactive=interactive)
   
   if (format == "xml") {
     data <- getWaterML1Data(url)

R/retrieveNWISqwData.r

@@ -8,6 +8,7 @@
 #' @param pCodes string or vector of USGS parameter code.  This is usually an 5 digit number.
 #' @param startDate string starting date for data retrieval in the form YYYY-MM-DD.
 #' @param endDate string ending date for data retrieval in the form YYYY-MM-DD.
+#' @param interactive logical Option for interactive mode.  If true, there is user interaction for error handling and data checks.
 #' @keywords data import USGS web service
 #' @return data dataframe with agency, site, dateTime, value, and code columns
 #' @export
@@ -23,9 +24,9 @@
 #' data$dateTime <- as.Date(data$dateTime)
 #' compressedData <- compressData(data)
 #' Sample <- populateSampleColumns(compressedData)
-retrieveNWISqwData <- function (siteNumber,pCodes,startDate,endDate){  
+retrieveNWISqwData <- function (siteNumber,pCodes,startDate,endDate,interactive=TRUE){  
   
-  url <- constructNWISURL(siteNumber,pCodes,startDate,endDate,"qw")
+  url <- constructNWISURL(siteNumber,pCodes,startDate,endDate,"qw",interactive=interactive)
   
   tmp <- read.delim(  
     url, 

R/retrieveUnitNWISData.r

@@ -25,7 +25,7 @@
 #' rawData2 <- retrieveUnitNWISData(siteNumber,ParameterCd,StartDate,EndDate,"tsv")
 retrieveUnitNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,format="xml",interactive=TRUE){  
   
-  url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"uv",format=format)
+  url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"uv",format=format,interactive=interactive)
   if (format == "xml") {
     data <- getWaterML1Data(url)
   } else {

man/retrieveNWISqwData.Rd

@@ -3,7 +3,7 @@
 \title{Raw Data Import for USGS NWIS QW Data}
 \usage{
   retrieveNWISqwData(siteNumber, pCodes, startDate,
-    endDate)
+    endDate, interactive = TRUE)
 }
 \arguments{
   \item{siteNumber}{string or vector of strings USGS site
@@ -17,6 +17,10 @@
 
   \item{endDate}{string ending date for data retrieval in
   the form YYYY-MM-DD.}
+
+  \item{interactive}{logical Option for interactive mode.
+  If true, there is user interaction for error handling and
+  data checks.}
 }
 \value{
   data dataframe with agency, site, dateTime, value, and