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.
This commit is contained in:
Fred Gleason 2020-02-21 15:49:11 -05:00
parent 5da5bfc7a7
commit 2e9b1e7d74
2 changed files with 9 additions and 4 deletions

View File

@ -19245,3 +19245,8 @@
* Added an rdsoftkeys(1) man page. * Added an rdsoftkeys(1) man page.
2019-10-31 Fred Gleason <fredg@paravelsystems.com> 2019-10-31 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.0. * Incremented the package version to 3.2.0.
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.

View File

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