From 925dcc2040b808c7e9e6a59e286d670e35e1161b Mon Sep 17 00:00:00 2001 From: robofish Date: Tue, 25 Oct 2011 19:51:51 +0200 Subject: [PATCH 1/3] Fixed 'strDelimiter' option not being used in .each and .parse function --- lib/csv.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/csv.js b/lib/csv.js index 48bfb7e..cbd205f 100644 --- a/lib/csv.js +++ b/lib/csv.js @@ -116,7 +116,7 @@ exports.each = function (filename, options) { var stream = new events.EventEmitter(); var emit_row = function(row) { - var data = CSVToArray(row)[0]; + var data = CSVToArray(row, strDelimiter)[0]; if (options["headers"]) { if (headers == null) { headers = data; @@ -181,13 +181,14 @@ exports.parse = function(str, options, data_listener) { throw new Exception("Data listener must be provided"); } options = (options || {}); + var strDelimiter = (options.strDelimiter || ","); var stream = new events.EventEmitter(); stream.addListener("data", data_listener); var parts = str.split("\n"); var pl = parts.length; var headers = null; for( var i = 0; i < pl; i++) { - var data = CSVToArray(parts[i])[0]; + var data = CSVToArray(parts[i], strDelimiter)[0]; if (options["headers"]) { if (headers == null) { headers = data; From 55bbc23ad020dacc1a820dd5c18c8f5bada59245 Mon Sep 17 00:00:00 2001 From: robofish Date: Tue, 25 Oct 2011 20:30:18 +0200 Subject: [PATCH 2/3] Fixed index.js to work with recent versions of node. process.mixin has been removed (node v0.1.33) --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index aba8fdd..3794120 100644 --- a/index.js +++ b/index.js @@ -1,2 +1,2 @@ // For your convenience -process.mixin(exports, require('./lib/csv')); \ No newline at end of file +modules.exports = require('./lib/csv'); From 7a878e4d5f367a3a8a5acad12e8ad36c0b83e2ce Mon Sep 17 00:00:00 2001 From: robofish Date: Tue, 25 Oct 2011 20:32:34 +0200 Subject: [PATCH 3/3] Fixed typo --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 3794120..e4e0635 100644 --- a/index.js +++ b/index.js @@ -1,2 +1,2 @@ // For your convenience -modules.exports = require('./lib/csv'); +module.exports = require('./lib/csv');