From 6ccf3b74d04da8b73b97f702c77d2a0ab50d8146 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Thu, 29 Nov 2018 14:09:00 -0600 Subject: [PATCH] fixed formatting for call log window --- web_tables.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web_tables.py b/web_tables.py index 67fbc77..8c5e30d 100755 --- a/web_tables.py +++ b/web_tables.py @@ -229,11 +229,11 @@ def process_message(_message): p = _message[1:].split(",") if p[0] == 'GROUP VOICE': if p[1] == 'END': - log_message = '{}: {} {}: SYSTEM: {:15.15s} SRC: {:8.8s} {:20.20s} SUB: {:8.8s} {:25.25s} TS: {} TGID: {:>5s} {:12.12s} DURATION: {}s'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), SRC_ids), p[5], alias_short(int(p[5]), subscriber_ids), p[6], p[7], alias_tgid(int(p[7]), talkgroup_ids), p[8]) + log_message = '{}: {} {}: SYS: {:15.15s}; SRC: {:8.8s} - {:20.20s}; TS: {}; TGID: {:>5s}; SUB: {:8.8s} - {:25.25s}; Time: {}s'.format(_now, p[0], p[1], p[2], p[4], alias_string(int(p[4]), peer_ids), p[6], p[7], p[5], alias_string(int(p[5]), subscriber_ids), p[8]) elif p[1] == 'START': - log_message = '{}: {} {}: SYSTEM: {:15.15s} SRC: {:8.8s} {:20.20s} SUB: {:8.8s} {:25.25s} TS: {} TGID: {:>5s} {:12.12s}'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), SRC_ids), p[5], alias_short(int(p[5]), subscriber_ids), p[6], p[7], alias_tgid(int(p[7]), talkgroup_ids)) + log_message = '{}: {} {}: SYS: {:15.15s}; SRC: {:8.8s} - {:20.20s}; TS: {}; TGID: {:>5s}; SUB: {:8.8s} - {:25.25s}'.format(_now, p[0], p[1], p[2], p[4], alias_string(int(p[4]), peer_ids), p[6], p[7], p[5], alias_string(int(p[5]), subscriber_ids)) elif p[1] == 'END WITHOUT MATCHING START': - log_message = '{}: {} {}: SYSTEM: {:15.15s} SRC: {:8.8s} {:20.20s} SUB: {:8.8s} {:25.25s} TS: {} TGID: {:>5s} {:12.12s}'.format(_now, p[0], p[1], p[2], p[4], alias_call(int(p[4]), SRC_ids), p[5], alias_short(int(p[5]), subscriber_ids), p[6], p[7], alias_tgid(int(p[7]), talkgroup_ids)) + log_message = '{}: {} {} on SYSTEM {:15.15s}: SRC: {:8.8s} - {}:20.20s; TS: {}; TGID: {:>5s}; SUB: {:8.8s} - {:25.25s}'.format(_now, p[0], p[1], p[2], p[4], alias_string(int(p[4]), peer_ids), p[6], p[7], p[5], alias_string(int(p[5]), subscriber_ids)) else: log_message = '{}: UNKNOWN GROUP VOICE LOG MESSAGE'.format(_now) else: