diff --git a/xmlout.js b/xmlout.js index 3f126f8..15dee38 100644 --- a/xmlout.js +++ b/xmlout.js @@ -174,13 +174,20 @@ function prefixMessageWithSN(data) { return data['MESSAGE']; } + sn = ''; + if (data['MESSAGE'].search(/^SN=.+;/) == -1) { if (data['SN'] && data['SN'].trim()) { + sn = data['SN'].trim(); return 'SN=' + data['SN'].trim() + '; ' + data['MESSAGE']; } else if (config.h2h_out.parse_sn == 'YES') { - return 'SN=' + parseSN(data['MESSAGE']) + '; ' + data['MESSAGE']; + sn = parseSN(data['MESSAGE']); } + + sn = sn.replace(/ /g, '-'); + + return 'SN=' + sn + '; ' + data['MESSAGE']; } return data['MESSAGE'];