diff --git a/lib/textParsers.js b/lib/textParsers.js index 939754af..85e60f86 100644 --- a/lib/textParsers.js +++ b/lib/textParsers.js @@ -59,13 +59,14 @@ var parseDate = function(isoDate) { var parseBool = function(val) { return val === 't'; -} +}; var parseIntegerArray = function(val) { - if(!val) return null; + if(!val) { return null; } var p = arrayParser.create(val, function(entry){ - if(entry != null) + if(entry !== null) { entry = parseInt(entry, 10); + } return entry; }); @@ -73,10 +74,11 @@ var parseIntegerArray = function(val) { }; var parseFloatArray = function(val) { - if(!val) return null; + if(!val) { return null; } var p = arrayParser.create(val, function(entry){ - if(entry != null) + if(entry !== null) { entry = parseFloat(entry, 10); + } return entry; }); @@ -84,7 +86,7 @@ var parseFloatArray = function(val) { }; var parseStringArray = function(val) { - if(!val) return null; + if(!val) { return null; } var p = arrayParser.create(val); return p.parse(); @@ -96,26 +98,27 @@ var YEAR = NUM + '\\s+years?'; var MON = NUM + '\\s+mons?'; var DAY = NUM + '\\s+days?'; var TIME = '([+-])?(\\d\\d):(\\d\\d):(\\d\\d)'; -var INTERVAL = [YEAR,MON,DAY,TIME].map(function(p){ return "("+p+")?" }).join('\\s*'); +var INTERVAL = [YEAR,MON,DAY,TIME].map(function(p){ return "("+p+")?"; }).join('\\s*'); var parseInterval = function(val) { - if (!val) return {}; + if (!val) { return {}; } var m = new RegExp(INTERVAL).exec(val); var i = {}; - if (m[2]) i.years = parseInt(m[2], 10); - if (m[4]) i.months = parseInt(m[4], 10); - if (m[6]) i.days = parseInt(m[6], 10); - if (m[9]) i.hours = parseInt(m[9], 10); - if (m[10]) i.minutes = parseInt(m[10], 10); - if (m[11]) i.seconds = parseInt(m[11], 10); + if (m[2]) { i.years = parseInt(m[2], 10); } + if (m[4]) { i.months = parseInt(m[4], 10); } + if (m[6]) { i.days = parseInt(m[6], 10); } + if (m[9]) { i.hours = parseInt(m[9], 10); } + if (m[10]) { i.minutes = parseInt(m[10], 10); } + if (m[11]) { i.seconds = parseInt(m[11], 10); } if (m[8] == '-'){ - if (i.hours) i.hours *= -1; - if (i.minutes) i.minutes *= -1; - if (i.seconds) i.seconds *= -1; + if (i.hours) { i.hours *= -1; } + if (i.minutes) { i.minutes *= -1; } + if (i.seconds) { i.seconds *= -1; } } - for (field in i){ - if (i[field] == 0) - delete i[field]; + for (var field in i){ + if (i[field] === 0) { + delete i[field]; + } } return i; }; @@ -125,35 +128,35 @@ var parseByteA = function(val) { // new 'hex' style response (pg >9.0) return new Buffer(val.substr(2), 'hex'); }else{ - out = "" - i = 0 + var out = ""; + var i = 0; while(i < val.length){ if(val[i] != "\\"){ - out += val[i] - ++i + out += val[i]; + ++i; }else{ if(val.substr(i+1,3).match(/[0-7]{3}/)){ - out += String.fromCharCode(parseInt(val.substr(i+1,3),8)) - i += 4 + out += String.fromCharCode(parseInt(val.substr(i+1,3),8)); + i += 4; }else{ - backslashes = 1 + backslashes = 1; while(i+backslashes < val.length && val[i+backslashes] == "\\") - backslashes++ + backslashes++; for(k=0; k maxLen) { - console.warn('WARNING: value %s is longer than max supported numeric value in javascript. Possible data loss', val) + console.warn('WARNING: value %s is longer than max supported numeric value in javascript. Possible data loss', val); } return parseFloat(val); }); @@ -187,5 +190,5 @@ var init = function(register) { }; module.exports = { - init: init, + init: init };