diff --git a/ChangeLog b/ChangeLog index 7fb0e8ff..38b97c69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19245,3 +19245,8 @@ * Added an rdsoftkeys(1) man page. 2019-10-31 Fred Gleason * Incremented the package version to 3.2.0. +2020-02-21 Fred Gleason + * 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. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index d3650b7c..bbbe14df 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -1191,10 +1191,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());