From a4bb6ccfb62afcbe7f7bcec230f42413ea6f0f37 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Fri, 7 Nov 2014 17:02:02 -0600
Subject: [PATCH] added some na logic.
---
R/constructNWISURL.r | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index 60667ddd..b9741719 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -44,16 +44,18 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
service <- match.arg(service, c("dv","uv","iv","qw","gwlevels","rating","peak","meas"))
- pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
-
- if(!pcodeCheck){
- badIndex <- which(parameterCd %in% parameterCdFile$parameter_cd)
- if(length(badIndex) > 0){
- badPcode <- parameterCd[-badIndex]
- } else {
- badPcode <- parameterCd
+ if(!is.na(parameterCd)){
+ pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
+
+ if(!pcodeCheck){
+ badIndex <- which(parameterCd %in% parameterCdFile$parameter_cd)
+ if(length(badIndex) > 0){
+ badPcode <- parameterCd[-badIndex]
+ } else {
+ badPcode <- parameterCd
+ }
+ message("The following pCodes may be unavailable:",paste(badPcode,collapse=","))
}
- message("The following pCodes may be unavailable:",paste(badPcode,collapse=","))
}
multipleSites <- length(siteNumber) > 1
--
GitLab