diff --git a/ChangeLog b/ChangeLog index cace2b68..c26e4dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15861,3 +15861,6 @@ web API call. * Added 'FADEUP_GAIN' and 'FADEDOWN_GAIN' parameters to the 'SaveLog' web API call. +2017-06-26 Fred Gleason <fredg@paravelsystems.com> + * Fixed a bug in 'web/rdxport'logs.cpp' that prevented saving of + events with a hard time set when using the web API 'SaveLog' call. diff --git a/web/rdxport/logs.cpp b/web/rdxport/logs.cpp index 4eae31ee..1bfbc5cb 100644 --- a/web/rdxport/logs.cpp +++ b/web/rdxport/logs.cpp @@ -286,14 +286,20 @@ void Xport::SaveLog() } ll->setCartNumber(integer1); - if(!xport_post->getValue(line+"_START_TIME",&integer1)) { - XmlExit("Missing "+line+"_START_TIME",400,"logs.cpp",LINE_NUMBER); - } if(!xport_post->getValue(line+"_TIME_TYPE",&integer2)) { XmlExit("Missing "+line+"_TIME_TYPE",400,"logs.cpp",LINE_NUMBER); } - ll->setStartTime((RDLogLine::StartTimeType)integer2, - QTime().addMSecs(integer1)); + ll->setTimeType((RDLogLine::TimeType)integer2); + + if(!xport_post->getValue(line+"_START_TIME",&integer1)) { + XmlExit("Missing "+line+"_START_TIME",400,"logs.cpp",LINE_NUMBER); + } + if(ll->timeType()==RDLogLine::Hard) { + ll->setStartTime(RDLogLine::Logged,QTime().addMSecs(integer1)); + } + else { + ll->setStartTime(RDLogLine::Predicted,QTime().addMSecs(integer1)); + } if(!xport_post->getValue(line+"_GRACE_TIME",&integer1)) { XmlExit("Missing "+line+"_GRACE_TIME",400,"logs.cpp",LINE_NUMBER);