Skip to content

Commit 1c44cb5

Browse files
committed
supressed debug output to console, added support for multiple metrics and dimensions per request (metrics and dimensions were being accepted, but not returned) - have kept style as consistent as possbile
1 parent fa78834 commit 1c44cb5

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

lib/ga.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ GA.prototype.get = function(options, cb) {
116116
});
117117
res.on('end', function() {
118118
var entries = []
119-
,metric_index
120-
,metric
121-
,dimension
122-
,dimension_index;
119+
,metric_indexes = []
120+
,metrics = []
121+
,dimensions = []
122+
,dimension_indexes = [];
123123

124124
var data_data = combineChunks(chunks, length).toString();
125125

@@ -129,12 +129,12 @@ GA.prototype.get = function(options, cb) {
129129

130130
for (var col=0; col<parsed_data.columnHeaders.length; col++){
131131
if(parsed_data.columnHeaders[col]['columnType'] === "METRIC"){
132-
metric_index = col;
133-
metric = parsed_data.columnHeaders[col];
132+
metric_indexes.push(col);
133+
metrics.push(parsed_data.columnHeaders[col]);
134134
}
135135
if(parsed_data.columnHeaders[col]['columnType'] === "DIMENSION"){
136-
dimension_index = col;
137-
dimension = parsed_data.columnHeaders[col];
136+
dimension_indexes.push(col);
137+
dimensions.push(parsed_data.columnHeaders[col]);
138138
}
139139
}
140140

@@ -143,11 +143,15 @@ GA.prototype.get = function(options, cb) {
143143
var entry = {metrics:[], dimensions:[]};
144144

145145
var object_metric = {};
146-
object_metric[metric.name] = parseInt(parsed_data.rows[i][metric_index], 10);
146+
for (var j=0; j<dimensions.length; j++){
147+
object_metric[metrics[j].name] = parseInt(parsed_data.rows[i][metric_indexes[j]], 10);
148+
}
147149
entry.metrics.push(object_metric);
148150

149151
var object_dimension = {};
150-
object_dimension[dimension.name] = parsed_data.rows[i][dimension_index];
152+
for (var j=0; j<dimensions.length; j++){
153+
object_dimension[dimensions[j].name] = parsed_data.rows[i][dimension_indexes[j]];
154+
}
151155
entry.dimensions.push(object_dimension);
152156

153157
self.emit('entry', entry);

0 commit comments

Comments
 (0)