diff --git a/R/importRDB1.r b/R/importRDB1.r index 916b5da4850c13fb06aafd49a4c740a15ee78505..674fc50bdd192e4a49e39f17659d0e41264599f9 100644 --- a/R/importRDB1.r +++ b/R/importRDB1.r @@ -151,10 +151,6 @@ importRDB1 <- function(obs_url, asDateTime=FALSE, qw=FALSE, convertType = TRUE, intColumns <- grep("_nu",names(data)) - if("current_rating_nu" %in% names(data)){ - intColumns <- intColumns[!("current_rating_nu" %in% names(data)[intColumns])] - data$current_rating_nu <- gsub(" ", "", data$current_rating_nu) - } data[,intColumns] <- sapply(data[,intColumns],as.integer) if(length(grep('d$', dataType)) > 0){ diff --git a/R/readNWISunit.r b/R/readNWISunit.r index c9376d1793dcd728de5e3afef69851cc2dc3dc6c..d8dabb757cc49a280efed7fec3ef4791d9999b20 100644 --- a/R/readNWISunit.r +++ b/R/readNWISunit.r @@ -204,6 +204,11 @@ readNWISrating <- function (siteNumber,type="base"){ data <- importRDB1(url, asDateTime=FALSE) + if("current_rating_nu" %in% names(data)){ + intColumns <- intColumns[!("current_rating_nu" %in% names(data)[intColumns])] + data$current_rating_nu <- gsub(" ", "", data$current_rating_nu) + } + if(nrow(data) > 0){ if(type == "base") { Rat <- grep("//RATING ", comment(data), value=TRUE, fixed=TRUE)