From 1e37f6bbdc7e25ef8a5e0355b2c95572205eeb33 Mon Sep 17 00:00:00 2001 From: Wayne Merricks Date: Sat, 4 Jun 2016 19:38:32 +0100 Subject: [PATCH] lib/rdcartslot.cpp Added MySQL v5.7+ changes Added usual checks. Line 690 EVENT_DATETIME is not required as this is derived from current system datetime as per line 665. --- lib/rdcartslot.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/rdcartslot.cpp b/lib/rdcartslot.cpp index c9ce3f8e..eaa43549 100644 --- a/lib/rdcartslot.cpp +++ b/lib/rdcartslot.cpp @@ -688,16 +688,18 @@ void RDCartSlot::LogPlayout(RDPlayDeck::State state) slot_logline->startSource())+ "STATION_NAME=\""+RDEscapeString(slot_station->name())+"\","+ "EVENT_DATETIME=\""+datetime.toString("yyyy-MM-dd")+ - " "+slot_logline->startTime(RDLogLine::Actual).toString("hh:mm:ss")+"\","+ - "EXT_START_TIME=\""+slot_logline->extStartTime().toString("hh:mm:ss")+"\","+ + " "+RDCheckDateTime( + slot_logline->startTime(RDLogLine::Actual),"hh:mm:ss")+"\","+ + "EXT_START_TIME=\""+RDCheckDateTime( + slot_logline->extStartTime(),"hh:mm:ss")+"\","+ "EXT_DATA=\""+RDEscapeString(slot_logline->extData())+"\","+ "EXT_EVENT_ID=\""+RDEscapeString(slot_logline->extEventId())+"\","+ "EXT_ANNC_TYPE=\""+RDEscapeString(slot_logline->extAnncType())+"\","+ "EXT_CART_NAME=\""+RDEscapeString(slot_logline->extCartName())+"\","+ "TITLE=\""+RDEscapeString(slot_logline->title())+"\","+ "ARTIST=\""+RDEscapeString(slot_logline->artist())+"\","+ - "SCHEDULED_TIME=\""+slot_logline->startTime(RDLogLine::Logged). - toString("hh:mm:ss")+"\","+ + "SCHEDULED_TIME=\""+RDCheckDateTime( + slot_logline->startTime(RDLogLine::Logged),"hh:mm:ss")+"\","+ "ISRC=\""+RDEscapeString(slot_logline->isrc())+"\","+ "PUBLISHER=\""+RDEscapeString(slot_logline->publisher())+"\","+ "COMPOSER=\""+RDEscapeString(slot_logline->composer())+"\","+