Fixed merge of variable info when there's a mix of NWIS and STORET.

R/readWQPdata.R

@@ -143,7 +143,7 @@ readWQPdata <- function(...){
       pCodeToName <- pCodeToName
       varExtras <- pCodeToName[pCodeToName$parm_cd %in% unique(variableInfo$parameterCd[!is.na(variableInfo$parameterCd)]),]
       names(varExtras)[names(varExtras) == "parm_cd"] <- "parameterCd"
-      variableInfo <- merge(variableInfo, varExtras, by="parameterCd")
+      variableInfo <- merge(variableInfo, varExtras, by="parameterCd", all = TRUE)
       variableInfo <- unique(variableInfo)
     }
     

R/readWQPqw.r

@@ -152,7 +152,7 @@ readWQPqw <- function(siteNumbers,parameterCd,startDate="",endDate=""){
     varExtras <- pCodeToName[pCodeToName$parm_cd %in% 
                                unique(variableInfo$parameterCd[!is.na(variableInfo$parameterCd)]),]
     names(varExtras)[names(varExtras) == "parm_cd"] <- "parameterCd"
-    variableInfo <- merge(variableInfo, varExtras, by="parameterCd")
+    variableInfo <- merge(variableInfo, varExtras, by="parameterCd", all=TRUE)
   }
   
   attr(retval, "siteInfo") <- siteInfo