Moving specific rating curve bit to rating curve function.

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){

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)