fix bugs with quotes

Author: Keyang

dist/csvtojson.js

@@ -1059,7 +1059,7 @@ function rowSplit(rowStr, param) {
           len-=1;
           if (e[0]!==quote){ // open quote
               if (e[len-1] === quote){ // possible close
-                  if (e[len-2]!==quote){ // close quote
+                  if (e[len-2]!==quote || e[len-2]===quote && e[len-3] === quote){ // close quote
                     e=e.substring(0,len-1);
                     e=twoDoubleQuote(e,quote);
                     row.push(e);
@@ -1081,11 +1081,11 @@ function rowSplit(rowStr, param) {
           continue;
       }
     }else{ //previous quote not closed
-      if (e[len-1] === quote && e[len-2] !==quote){ //close double quote
+      if (e[len-1] === quote && (e[len-2] !==quote || e[len-2] === quote && e[len-3] === quote)){ //close double quote
         inquote=false;
         e=e.substr(0,len-1);
         quoteBuff+=delimiter+e;
-        quoteBuf=twoDoubleQuote(quoteBuff,quote);
+        quoteBuff=twoDoubleQuote(quoteBuff,quote);
         if (trim){
           quoteBuff=quoteBuff.trimRight();
         }
@@ -10144,7 +10144,7 @@ module.exports={
       "email": "t3dodson@gmail.com"
     }
   ],
-  "version": "0.5.8",
+  "version": "0.5.9",
   "keywords": [
     "csv",
     "csvtojson",

dist/csvtojson.min.js

@@ -52,7 +52,7 @@ function rowSplit(rowStr, param) {
           len-=1;
           if (e[0]!==quote){ // open quote
               if (e[len-1] === quote){ // possible close
-                  if (e[len-2]!==quote){ // close quote
+                  if (e[len-2]!==quote || e[len-2]===quote && e[len-3] === quote){ // close quote
                     e=e.substring(0,len-1);
                     e=twoDoubleQuote(e,quote);
                     row.push(e);
@@ -74,11 +74,11 @@ function rowSplit(rowStr, param) {
           continue;
       }
     }else{ //previous quote not closed
-      if (e[len-1] === quote && e[len-2] !==quote){ //close double quote
+      if (e[len-1] === quote && (e[len-2] !==quote || e[len-2] === quote && e[len-3] === quote)){ //close double quote
         inquote=false;
         e=e.substr(0,len-1);
         quoteBuff+=delimiter+e;
-        quoteBuf=twoDoubleQuote(quoteBuff,quote);
+        quoteBuff=twoDoubleQuote(quoteBuff,quote);
         if (trim){
           quoteBuff=quoteBuff.trimRight();
         }

libs/core/utils.js

@@ -18,7 +18,7 @@
       "email": "t3dodson@gmail.com"
     }
   ],
-  "version": "0.5.8",
+  "version": "0.5.9",
   "keywords": [
     "csv",
     "csvtojson",

package.json

@@ -0,0 +1,5 @@
+Year,Make,Model,Description,Price
+1997,Ford,E350,"ac, abs, moon",3000.00
+1999,Chevy,"Venture ""Extended Edition""","",4900.00
+1999,Chevy,"Venture ""Extended Edition, Very Large""",,5000.00
+1996,Jeep,Grand Cherokee,"MUST SELL!air, moon roof, loaded",4799.00

test/data/dataWithTripleQoutes

@@ -152,7 +152,21 @@ describe("CSV Converter", function() {
     });
     rs.pipe(conv);
 
-  })
+  });
+  it ("should convert triple quotes correctly",function(done){
+    var testData = __dirname + "/data/dataWithTripleQoutes";
+    var rs = fs.createReadStream(testData);
+    var conv=new Converter({trim:true});
+    conv.on("end_parsed",function(res){
+      console.log(res);
+      assert.equal(res[0].Description,"ac, abs, moon");
+      assert.equal(res[1].Model,"Venture \"Extended Edition\"");
+      assert.equal(res[2].Model,"Venture \"Extended Edition, Very Large\"");
+      done();
+    });
+    rs.pipe(conv);
+
+  });
   // it ("should convert big csv",function(done){
   //   // var rs=fs.createReadStream(__dirname+"/data/large-csv-sample.csv");
   //   var rs=fs.createReadStream("/Users/kxiang/tmp/csvdata");