Commit 39af55cbf71e698c736ea26ebd8f7bb4dc933b0e
1 parent
ae9ce259d7
Exists in
master
update prefixMessageWithSN again
Showing 1 changed file with 8 additions and 5 deletions Side-by-side Diff
xmlout.js
| ... | ... | @@ -177,10 +177,7 @@ function prefixMessageWithSN(data) { |
| 177 | 177 | sn = ''; |
| 178 | 178 | |
| 179 | 179 | if (data.SN && data.SN.trim()) { |
| 180 | - sn = data['SN'].replace(/ /g, '-'); | |
| 181 | - sn = sn.replace(/[\()]/g, '-'); | |
| 182 | - sn = sn.replace(/-/g, '-').trim(); | |
| 183 | - return 'SN=' + sn + '; ' + data['MESSAGE']; | |
| 180 | + sn = data['SN'].trim(); | |
| 184 | 181 | } |
| 185 | 182 | else if (data['MESSAGE'].search(/^SN=.+;/) == -1) { |
| 186 | 183 | if (data['SN'] && data['SN'].trim()) { |
| ... | ... | @@ -189,9 +186,15 @@ function prefixMessageWithSN(data) { |
| 189 | 186 | else if (config.h2h_out.parse_sn == 'YES') { |
| 190 | 187 | sn = parseSN(data['MESSAGE']); |
| 191 | 188 | } |
| 189 | + } | |
| 192 | 190 | |
| 191 | + if (sn) { | |
| 193 | 192 | sn = sn.replace(/ /g, '-'); |
| 194 | - | |
| 193 | + sn = sn.replace(/[\()]/g, '-'); | |
| 194 | + sn = sn.replace(/-+/g, '-') | |
| 195 | + sn = sn.replace(/^-+/, ''); | |
| 196 | + sn = sn.replace(/-+$/, ''); | |
| 197 | + sn = sn.trim(); | |
| 195 | 198 | return 'SN=' + sn + '; ' + data['MESSAGE']; |
| 196 | 199 | } |
| 197 | 200 |