[Analogue-commits] r148 - pkg/R

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2009-08-16 19:30:58 +0200 (Sun, 16 Aug 2009)
New Revision: 148

Modified:
   pkg/R/join.R
Log:
Selection of columns incorrect in leftJoin internal fun

Modified: pkg/R/join.R
===================================================================
--- pkg/R/join.R	2009-08-16 13:19:38 UTC (rev 147)
+++ pkg/R/join.R	2009-08-16 17:30:58 UTC (rev 148)
@@ -67,10 +67,12 @@
             dfs <- X[[2]]
         ## matched column names
         mcn <- match(colnames(dfs), cn)
+        mcn2 <- match(cn, colnames(dfs))
         mcn <- mcn[!is.na(mcn)]
+        mcn2 <- mcn2[!is.na(mcn2)]
         joined <- matrix(NA, ncol = dims[1,2], nrow = sum(dims[,1]))
         joined[1:dims[1,1], ] <- data.matrix(X[[1]])
-        joined[(dims[1,1]+1):NROW(joined), mcn] <- data.matrix(dfs[, mcn])
+        joined[(dims[1,1]+1):NROW(joined), mcn] <- data.matrix(dfs[, mcn2])
         colnames(joined) <- cn
         return(joined)
     }