Browse Source

Revert "Added a new config option called "additionalDelimitersToGuess" that"

This reverts commit ea08648dbf.
pull/555/head
Steven Jeffries 7 years ago
parent
commit
3ea8cf3558
  1. 7
      papaparse.js
  2. 40
      tests/test-cases.js

7
papaparse.js

@ -1024,7 +1024,7 @@ @@ -1024,7 +1024,7 @@
_delimiterError = false;
if (!_config.delimiter)
{
var delimGuess = guessDelimiter(input, _config.newline, _config.skipEmptyLines, _config.comments, _config.additionalDelimitersToGuess);
var delimGuess = guessDelimiter(input, _config.newline, _config.skipEmptyLines, _config.comments);
if (delimGuess.successful)
_config.delimiter = delimGuess.bestDelimiter;
else
@ -1208,10 +1208,9 @@ @@ -1208,10 +1208,9 @@
return _results;
}
function guessDelimiter(input, newline, skipEmptyLines, comments, additionalDelimitersToGuess)
function guessDelimiter(input, newline, skipEmptyLines, comments)
{
additionalDelimitersToGuess = additionalDelimitersToGuess || [];
var delimChoices = [',', '\t', '|', ';', Papa.RECORD_SEP, Papa.UNIT_SEP].concat(additionalDelimitersToGuess);
var delimChoices = [',', '\t', '|', ';', Papa.RECORD_SEP, Papa.UNIT_SEP];
var bestDelim, bestDelta, fieldCountPrevRow;
for (var i = 0; i < delimChoices.length; i++)

40
tests/test-cases.js

@ -2110,6 +2110,7 @@ var CUSTOM_TESTS = [ @@ -2110,6 +2110,7 @@ var CUSTOM_TESTS = [
});
}
}
];
describe('Custom Tests', function() {
@ -2126,42 +2127,3 @@ describe('Custom Tests', function() { @@ -2126,42 +2127,3 @@ describe('Custom Tests', function() {
generateTest(CUSTOM_TESTS[i]);
}
});
var DELIMITERS_TO_GUESS_TESTS = [
{
description: "Should correctly guess custom delimiter when passed additional delimiters to guess.",
expected: "~",
run: function(callback) {
var results = Papa.parse('"A"~"B"~"C"~"D"', {
additionalDelimitersToGuess: ['~', '@', '%']
});
callback(results.meta.delimiter);
}
},
{
description: "Should still correctly guess default delimiters when additional delimiters to guess are given.",
expected: ",",
run: function(callback) {
var results = Papa.parse('"A","B","C","D"', {
additionalDelimitersToGuess: ['~', '@', '%']
});
callback(results.meta.delimiter);
}
}
];
describe('Additional Delimiters to Guess Tests', function() {
function generateTest(test) {
(test.disabled ? it.skip : it)(test.description, function(done) {
test.run(function(actual) {
assert.deepEqual(JSON.stringify(actual), JSON.stringify(test.expected));
done();
});
});
}
for (var i = 0; i < DELIMITERS_TO_GUESS_TESTS.length; i++) {
generateTest(DELIMITERS_TO_GUESS_TESTS[i]);
}
});

Loading…
Cancel
Save