Revert "generate cleaner output"

This reverts commit b5b5d5e.
cheminfo · Jan 16, 2018 · 8011b6e · 8011b6e
1 parent bd31c8a
commit 8011b6e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 56 deletions.
diff --git a/__tests__/parse.js b/__tests__/parse.js
@@ -8,7 +8,7 @@ describe('check TD1 parse', function () {
     '7408122F1204159UTO<<<<<<<<<<<6\n' +
     'ERIKSSON<<ANNA<MARIA<<<<<<<<<<';
 
-  var result = parse(MRZ, { debug: true });
+  var result = parse(MRZ);
   it('Check result', function () {
     result.error.length.should.equal(2);
     result.firstname.value.should.equal('ANNA MARIA');
@@ -22,23 +22,18 @@ describe('check TD1 parse extended document number', function () {
 7408122F1204159UTO<<<<<<<<<<<6
 ERIKSSON<<ANNA<MARIA<<<<<<<<<<`;
 
-  it('Check result (debug)', function () {
-    const result = parse(MRZ, { debug: true });
+  var result = parse(MRZ);
+  it('Check result', function () {
     result.documentNumber.value.should.equal('D23145890123');
     result.documentNumber.isValid.should.be.equal(true);
   });
-
-  it('Check result', function () {
-    const result = parse(MRZ);
-    result.values.documentNumber.should.equal('D23145890123');
-  });
 });
 
 describe('check TD2 parse', function () {
   const MRZ = `I<UTOERIKSSON<<ANNA<MARIA<<<<<<<<<<<
 D231458907UTO7408122F1204159<<<<<<<6`;
 
-  var result = parse(MRZ, { debug: true });
+  var result = parse(MRZ);
   it('Check result', function () {
     result.error.length.should.equal(2);
     result.firstname.value.should.equal('ANNA MARIA');
@@ -53,38 +48,23 @@ describe('check TD3 parse', function () {
     'P<UTOERIKSSON<<ANNA<MARIA<<<<<<<<<<<<<<<<<<<\n' +
     'L898902C36UTO7408122F1204159ZE184226B<<<<<10';
 
-  const expectedFirstname = 'ANNA MARIA';
-  const expecteLastname = 'ERIKSSON';
-  const expectedNationality = 'UTO';
-  const expectedDocumentNumber = 'L898902C3';
-
-  it('Check result (debug)', function () {
-    const result = parse(MRZ, { debug: true });
+  var result = parse(MRZ);
+  it('Check result', function () {
     result.error.length.should.equal(2);
-    result.firstname.value.should.equal(expectedFirstname);
-    result.lastname.value.should.equal(expecteLastname);
-    result.nationality.source.should.equal(expectedNationality);
-    result.documentNumber.value.should.equal(expectedDocumentNumber);
+    result.firstname.value.should.equal('ANNA MARIA');
+    result.lastname.value.should.equal('ERIKSSON');
+    result.nationality.source.should.equal('UTO');
+    result.documentNumber.value.should.equal('L898902C3');
     result.isValid.should.be.equal(false);
   });
-
-  it('check result', function () {
-    const result = parse(MRZ);
-    result.values.firstname.should.equal(expectedFirstname);
-    result.values.lastname.should.equal(expecteLastname);
-    result.values.nationality.should.equal(expectedNationality);
-    result.values.documentNumber.should.equal(expectedDocumentNumber);
-    result.errors.length.should.equal(2);
-    result.isValid.should.equal(false);
-  });
 });
 
 describe('check PCC parse', function () {
   const MRZ = `AAA001D<<
 FACHE305142128097<<800126<<<<<
 MARCHAND<<FABIENNE<<<<<<<<<<<<`;
 
-  var result = parse(MRZ, { debug: true });
+  var result = parse(MRZ);
   it('Check result', function () {
     result.error.length.should.equal(0);
     result.firstname.value.should.equal('FABIENNE');

diff --git a/src/parse/parse.js b/src/parse/parse.js
@@ -5,9 +5,9 @@ var parseTD2 = require('./td2');
 var parseTD3 = require('./td3');
 var parsePCC = require('./pcc');
 
-module.exports = function parse(text, options = {}) {
-  const lines = text.split(/[\r\n]+/);
-  let result = { logs: [] };
+module.exports = function parse(text) {
+  var lines = text.split(/[\r\n]+/);
+  var result = { logs: [] };
   switch (lines.length) {
     case 2:
       if (lines[0].length < 41) {
@@ -17,8 +17,7 @@ module.exports = function parse(text, options = {}) {
       }
       break;
     case 3:
-      if (lines[0].length < 15) {
-        // in fact it should be 9
+      if (lines[0].length < 15) { // in fact it should be 9
         result = parsePCC(lines);
       } else {
         result = parseTD1(lines);
@@ -28,23 +27,5 @@ module.exports = function parse(text, options = {}) {
     default:
       result.logs.push('We need 2 or 3 lines');
   }
-
-  if (options.debug) {
-    return result;
-  }
-
-  const simpleResult = {
-    values: {},
-    errors: []
-  };
-
-  for (let key in result) {
-    if (result[key].error) simpleResult.errors.push(...result[key].error);
-    if (result[key].value !== undefined) {
-      simpleResult.values[key] = result[key].value;
-    }
-  }
-  simpleResult.isValid = result.isValid;
-
-  return simpleResult;
+  return result;
 };
diff --git a/src/util/globalCheck.js b/src/util/globalCheck.js
@@ -11,7 +11,7 @@ module.exports = function globalCheck(source, value) {
   return {
     ifValid: checkResult,
     source,
-    value: checkResult ? 'valid' : 'non valid',
+    value: (checkResult) ? 'valid' : 'non valid',
     label: 'Global check digit',
     error
   };