From 64acb9d1ebbf92e9f129b7e708b6619de623546c Mon Sep 17 00:00:00 2001
From: Brent Pedersen <bpederse@gmail.com>
Date: Fri, 24 Aug 2012 10:06:26 -0600
Subject: [PATCH] use TokenizeColumns in groupBy and add lineFileUtilities as
dependency to Makefile
---
src/groupBy/Makefile | 2 +-
src/groupBy/groupBy.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/groupBy/Makefile b/src/groupBy/Makefile
index fe86d953..51fe345e 100644
--- a/src/groupBy/Makefile
+++ b/src/groupBy/Makefile
@@ -16,7 +16,7 @@ INCLUDES = -I$(UTILITIES_DIR)/tabFile/ \
# ----------------------------------
# define our source and object files
# ----------------------------------
-SOURCES= groupBy.cpp
+SOURCES= groupBy.cpp $(UTILITIES_DIR)/lineFileUtilities/lineFileUtilities.h
OBJECTS= groupBy.o
BUILT_OBJECTS= $(patsubst %,$(OBJ_DIR)/%,$(OBJECTS))
diff --git a/src/groupBy/groupBy.cpp b/src/groupBy/groupBy.cpp
index f5c69c41..0cf19119 100644
--- a/src/groupBy/groupBy.cpp
+++ b/src/groupBy/groupBy.cpp
@@ -172,10 +172,10 @@ int groupby_main(int argc, char* argv[]) {
// Split the column string sent by the user into discrete column numbers
// A comma separated string is expected.
vector<int> groupColumnsInt;
- Tokenize(groupColumnsString, groupColumnsInt, ',');
+ TokenizeColumns(groupColumnsString, groupColumnsInt);
vector<int> opColumnsInt;
- Tokenize(opsColumnString, opColumnsInt, ',');
+ TokenizeColumns(opsColumnString, opColumnsInt);
// sanity check the group columns
for(size_t i = 0; i < groupColumnsInt.size(); ++i) {
--
GitLab