From 91d9e8e8ddb7e90d8ce486515a38bbbd1f5a0390 Mon Sep 17 00:00:00 2001
From: "Egeler, Paul W" <paul.egeler@spectrumhealth.org>
Date: Wed, 6 Jun 2018 18:17:57 -0400
Subject: [PATCH] r-pkg: preserving order of columns in output tables

---
 R/R/REDCap_split.r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/R/REDCap_split.r b/R/R/REDCap_split.r
index fda1216..da6cba9 100644
--- a/R/R/REDCap_split.r
+++ b/R/R/REDCap_split.r
@@ -159,12 +159,12 @@ REDCap_split <- function(records, metadata) {
 
     if (i == "") {
 
-      out_fields <- fields[!fields[,2] %in% subtables, 1]
+      out_fields <- which(vars_in_data %in% fields[!fields[,2] %in% subtables, 1])
       out[[which(names(out) == "")]] <- out[[which(names(out) == "")]][out_fields]
 
     } else {
 
-      out_fields <- c(repeat_instrument_fields, fields[fields[,2] == i, 1])
+      out_fields <- which(vars_in_data %in% c(repeat_instrument_fields, fields[fields[,2] == i, 1]))
       out[[i]] <- out[[i]][out_fields]
 
     }