Ticket #141: feature request - emit header event

Ticket #198: bug fix - using pipe cause issues.
Keyang · Sep 30, 2017 · 5a2251c · 5a2251c
1 parent 41379c7
commit 5a2251c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 8 deletions.
diff --git a/libs/core/Converter.js b/libs/core/Converter.js
@@ -302,7 +302,7 @@ Converter.prototype.processHead = function (fileLine, cb) {
   }
   var res = linesToJson(lines.lines, params, 0);
   // Put the header with the first row
-  if(res.length > 0) res[0].header = params._headers;
+  // if(res.length > 0) res[0].header = params._headers;
   this.processResult(res);
   this.lastIndex += res.length;
   this.recordNum += res.length;
@@ -354,7 +354,7 @@ Converter.prototype.processResult = function (result) {
 
 Converter.prototype.emitResult = function (r) {
   var index = r.index;
-  var header = r.header;
+  var header = this.param;
   var row = r.row;
   var result = r.json;
   var resultJson = null;
@@ -374,8 +374,8 @@ Converter.prototype.emitResult = function (r) {
     this.transform(resultJson, row, index);
     resultStr = null;
   }
-  if (this._needEmitHeader && header) {
-    this.emit("header", header);
+  if (this._needEmitHeader && this.param._headers && index === 0) {
+    this.emit("header", this.param._headers);
   }
   if (this._needEmitJson) {
     this.emit("json", resultJson, index);

diff --git a/libs/core/rowSplit.js b/libs/core/rowSplit.js
@@ -119,11 +119,13 @@ function _escapeQuote(segment, quote, escape) {
 
   var key = "es|" + quote + "|" + escape;
   if (cachedRegExp[key] === undefined) {
-    if (escape === "\\") {
-      escape = "\\\\";
-    }
-    cachedRegExp[key] = new RegExp(escape + quote, 'g');
+
+    // if (escape === "\\") {
+    //   escape = "\\\\";
+    // }
+    cachedRegExp[key] = new RegExp('\\'+escape + '\\'+quote, 'g');
   }
   var regExp = cachedRegExp[key];
+  // console.log(regExp,segment);
   return segment.replace(regExp, quote);
 }
diff --git a/test/data/pipeAsQuote b/test/data/pipeAsQuote
@@ -0,0 +1,2 @@
+test,test2,test3
+blag,blagh,|blahhh, blah|
diff --git a/test/testCSVConverter2.js b/test/testCSVConverter2.js
@@ -430,15 +430,23 @@ describe("CSV Converter", function () {
 
   it("should ignore column", function(done) {
     var rs = fs.createReadStream(__dirname + "/data/dataWithQoutes");
+    var headerEmitted=false;
     csv({
      ignoreColumns:[0]
     })
     .fromStream(rs)
     .on("header", function(header) {
       assert.equal(header.indexOf("TIMESTAMP"), -1);
       assert.equal(header.indexOf("UPDATE"), 0);
+      if (headerEmitted){
+        throw("header event should only happen once")
+      }
+      headerEmitted=true;
     })
     .on("csv", function(row, idx) {
+      if (!headerEmitted) {
+        throw("header should be emitted before any data events");
+      }
       assert(idx >= 0);
       if (idx ===1){
         assert.equal(row[0],"n");
@@ -449,6 +457,7 @@ describe("CSV Converter", function () {
       assert(idx >= 0);
     })
     .on("end", function() {
+      assert(headerEmitted);
       done();
     });
   });

diff --git a/test/testCSVConverter3.js b/test/testCSVConverter3.js
@@ -73,4 +73,16 @@ describe("CSV Converter", function () {
         done()
       });
   })
+  it("should accept pipe as quote", function (done) {
+    csv({
+      quote:"|"
+    })
+      .fromFile(__dirname + "/data/pipeAsQuote")
+      .on('csv', function (csv) {
+        assert.equal(csv[2],"blahhh, blah");
+      })
+      .on('done', function () {
+        done()
+      });
+  })
 });