Changeset 489 for Dev/trunk/src/node_modules/ya-csv/lib/ya-csv.js

Timestamp:

03/08/14 11:41:10 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Update node modules

File:

• Dev/trunk/src/node_modules/ya-csv/lib/ya-csv.js (modified) (4 diffs)

Dev/trunk/src/node_modules/ya-csv/lib/ya-csv.js

@@ -73 +73 @@
          * @return {ReadStream} the readstream instance
          */
-        self.destoy = function(){
+        self.destroy = function(){
             readStream.destroy();
             return self;
@@ -113 +113 @@
                 var isEscape = false;
                 if (c === this.escapechar) {
-                    var nextChar = data.charAt(i + 1);
-                    if (this._isEscapable(nextChar)) {
-                        this._addCharacter(nextChar);
-                        i++;
-                        isEscape = true;
+                    // double-quote at the field beginning does not count as an escape string`
+                    if (c !== this.quotechar || ps.openField || ps.quotedField) {
+                       var nextChar = data.charAt(i + 1);
+                       if (this._isEscapable(nextChar)) {
+                           this._addCharacter(nextChar);
+                           i++;
+                           isEscape = true;
+                        }
                     }
                 }
@@ -217 +220 @@
     var ps = this.parsingStatus;
     if (this.columnsFromHeader && ps.rows === 0) {
-        this.setColumnNames(ps.openRecord);
+        // user has passed columnNames through option
+        if (this.columnNames.length === 0)
+          this.setColumnNames(ps.openRecord);
     } else if (this.columnNames != null && this.columnNames.length > 0) {
         var objResult = {};
@@ -327 +332 @@
 function _setOptions(obj, options) {
     options = options || {};
-    obj.separator   = options.separator   || ',';
-    obj.quotechar   = options.quote       || '"';
-    obj.escapechar  = options.escape      || '"';
-    obj.commentchar = options.comment     || '';
-    obj.columnNames = options.columnNames || [];
-    obj.columnsFromHeader = options.columnsFromHeader || false;
-    obj.nestedQuotes = options.nestedQuotes || false;
-};
+    obj.separator = (typeof options.separator !== 'undefined') ? options.separator : ',';
+    obj.quotechar = (typeof options.quote !== 'undefined') ? options.quote : '"';
+    obj.escapechar = (typeof options.escape !== 'undefined') ? options.escape : '"';
+    obj.commentchar = (typeof options.comment !== 'undefined') ? options.comment : '';
+    obj.columnNames = (typeof options.columnNames !== 'undefined') ? options.columnNames : [];
+    obj.columnsFromHeader = (typeof options.columnsFromHeader !== 'undefined') ? options.columnsFromHeader : false;
+    obj.nestedQuotes = (typeof options.nestedQuotes !== 'undefined') ? options.nestedQuotes : false;
+};