From 70f93bc261168bc05cdfffd613ba78a3f61010d6 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Fri, 19 Sep 2014 16:58:44 -0500
Subject: [PATCH] Made the merge nicer.
---
R/getWaterML1Data.r | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/R/getWaterML1Data.r b/R/getWaterML1Data.r
index 07a874c1..46511096 100644
--- a/R/getWaterML1Data.r
+++ b/R/getWaterML1Data.r
@@ -137,7 +137,9 @@ getWaterML1Data <- function(obs_url){
if (1 == i & valuesIndex[1] == j){
mergedDF <- df
} else {
- mergedDF <- merge(mergedDF, df,by=c("agency_cd","site_no","datetime","tz_cd"),all=TRUE)
+ similarNames <- intersect(names(mergedDF), names(df))
+ mergedDF <- merge(mergedDF, df,by=similarNames,all=TRUE)
+# mergedDF <- merge(mergedDF, df,by=c("agency_cd","site_no","datetime","tz_cd"),all=TRUE)
}
}
}
--
GitLab