Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-28 06:32:32 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
Fred Gleason 2020-02-21 16:56:03 -05:00
commit 5fff25c5d4
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -19245,6 +19245,7 @@
* Added an rdsoftkeys(1) man page.
2019-10-31 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.0.
<<<<<<< HEAD
2019-11-20 Fred Gleason <fredg@paravelsystems.com>
* Added interlocks to the 'Edit Switcher' and 'Edit Serial Ports'
dialogs in rdadmin(1) to prohibit use of a disabled serial device.
@ -19659,3 +19660,11 @@
* Added a 'metadata_wildcard_test' harness.
2020-02-19 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.1int3.
2020-02-21 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogmanager(1) that caused trailer
whitespace to be generated in the 'EXT_DATA', 'EXT_EVENT',
'EXT_ANNC_TYPE' and 'EXT_CART_NAME' log fields when importing
from a CounterPoint format log.
2020-02-21 Fred Gleason <fredg@paravelsystems.com>
* Added a syslog message for each CIC update in the 'pypad_xds.py'
script.

2
apis/pypad/scripts/pypad_xds.py
View File

@ -25,6 +25,7 @@ import socket
import configparser
import serial
import time
import syslog
import pypad
#
@ -77,6 +78,7 @@ def ProcessPad(update):
if update.shouldBeProcessed(section) and update.hasPadType(pypad.TYPE_NOW) and update.hasService() and (last_updates[update.machine()] != update.startDateTimeString(pypad.TYPE_NOW)):
last_updates[update.machine()]=update.startDateTimeString(pypad.TYPE_NOW)
packet='0:'+update.serviceProgramCode()+':'+update.config().get(section,'IsciPrefix')+FilterField(update.padField(pypad.TYPE_NOW,pypad.FIELD_EXTERNAL_EVENT_ID))+':*'
update.syslog(syslog.LOG_INFO,'sending CIC update "'+packet+'"')
reps=range(1)
if(update.config().has_option(section,'Repetitions')):
reps=range(update.config().getint(section,'Repetitions'))

8
lib/rdevent_line.cpp
View File

@ -1161,10 +1161,10 @@ bool RDEventLine::linkLog(RDLogEvent *e,RDLog *log,const QString &svcname,
logline->setExtStartTime(QTime().addSecs(3600*start_start_hour+
q->value(1).toInt()));
logline->setExtLength(q->value(2).toInt());
logline->setExtData(q->value(3).toString());
logline->setExtEventId(q->value(4).toString());
logline->setExtAnncType(q->value(5).toString());
logline->setExtCartName(q->value(6).toString());
logline->setExtData(q->value(3).toString().trimmed());
logline->setExtEventId(q->value(4).toString().trimmed());
logline->setExtAnncType(q->value(5).toString().trimmed());
logline->setExtCartName(q->value(6).toString().trimmed());
logline->setEventLength(event_length);
logline->setLinkEventName(event_name);
logline->setLinkStartTime(link_logline->linkStartTime());