kopia lustrzana https://github.com/backface/turtlestitch
tweaked csv-parser to omit the last record if it is empty
rodzic
6aaf9cfa07
commit
ba76995ab6
|
@ -2796,7 +2796,7 @@ Process.prototype.parseCSV = function (text) {
|
||||||
// list of fields instead (for backwards-compatibility)
|
// list of fields instead (for backwards-compatibility)
|
||||||
var prev = '',
|
var prev = '',
|
||||||
fields = [''],
|
fields = [''],
|
||||||
result = [fields],
|
records = [fields],
|
||||||
col = 0,
|
col = 0,
|
||||||
r = 0,
|
r = 0,
|
||||||
esc = true,
|
esc = true,
|
||||||
|
@ -2821,8 +2821,8 @@ Process.prototype.parseCSV = function (text) {
|
||||||
}
|
}
|
||||||
char = '';
|
char = '';
|
||||||
r += 1;
|
r += 1;
|
||||||
result[r] = [char];
|
records[r] = [char];
|
||||||
fields = result[r];
|
fields = records[r];
|
||||||
col = 0;
|
col = 0;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -2830,13 +2830,24 @@ Process.prototype.parseCSV = function (text) {
|
||||||
}
|
}
|
||||||
prev = char;
|
prev = char;
|
||||||
}
|
}
|
||||||
result = new List(result.map(
|
|
||||||
|
// remove the last record, if it is empty
|
||||||
|
if (records[records.length - 1].length === 1 &&
|
||||||
|
records[records.length - 1][0] === '')
|
||||||
|
{
|
||||||
|
records.pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert arrays to Snap! Lists
|
||||||
|
records = new List(records.map(
|
||||||
function (row) {return new List(row); })
|
function (row) {return new List(row); })
|
||||||
);
|
);
|
||||||
if (result.length() === 1) {
|
|
||||||
return result.at(1);
|
// for backwards compatibility return the first row if it is the only one
|
||||||
|
if (records.length() === 1) {
|
||||||
|
return records.at(1);
|
||||||
}
|
}
|
||||||
return result;
|
return records;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Ładowanie…
Reference in New Issue