Merge branch 'stable' of https://github.com/waynemerricks/rivendell into waynemerricks-stable

This commit is contained in:
Fred Gleason
2016-06-14 11:25:43 -04:00
23 changed files with 228 additions and 109 deletions

View File

@@ -44,17 +44,23 @@ void LogTraffic(const QString &svcname,const QString &logname,
if((logline==NULL)||(svcname.isEmpty())) {
return;
}
QString eventDateTimeSQL = "NULL";
if(datetime.isValid() && logline->startTime(RDLogLine::Actual).isValid())
eventDateTimeSQL = RDCheckDateTime(QDateTime(datetime.date(),
logline->startTime(RDLogLine::Actual)), "yyyy-MM-dd hh:mm:ss");
sql=QString("insert into `")+RDSvc::svcTableName(svcname)+"` set "+
QString().sprintf("LENGTH=%d,",length)+
"LOG_NAME=\""+RDEscapeString(logname.utf8())+"\","+
QString().sprintf("LOG_ID=%d,",logline->id())+
QString().sprintf("CART_NUMBER=%u,",logline->cartNumber())+
"STATION_NAME=\""+RDEscapeString(rdstation_conf->name().utf8())+"\","+
"EVENT_DATETIME=\""+datetime.toString("yyyy-MM-dd")+" "+
logline->startTime(RDLogLine::Actual).toString("hh:mm:ss")+"\","+
"EVENT_DATETIME="+eventDateTimeSQL+","+
QString().sprintf("EVENT_TYPE=%d,",action)+
QString().sprintf("EVENT_SOURCE=%d,",logline->source())+
"EXT_START_TIME=\""+logline->extStartTime().toString("hh:mm:ss")+"\","+
"EXT_START_TIME=\""+RDCheckDateTime(logline->extStartTime(),"hh:mm:ss")+"\","+
QString().sprintf("EXT_LENGTH=%d,",logline->extLength())+
"EXT_DATA=\""+RDEscapeString(logline->extData())+"\","+
"EXT_EVENT_ID=\""+RDEscapeString(logline->extEventId())+"\","+
@@ -64,8 +70,8 @@ void LogTraffic(const QString &svcname,const QString &logname,
"EXT_CART_NAME=\""+RDEscapeString(logline->extCartName().utf8())+"\","+
"TITLE=\""+RDEscapeString(logline->title().utf8())+"\","+
"ARTIST=\""+RDEscapeString(logline->artist().utf8())+"\","+
"SCHEDULED_TIME=\""+RDEscapeString(logline->startTime(RDLogLine::Logged).
toString("hh:mm:ss"))+"\","+
"SCHEDULED_TIME="+RDCheckDateTime(logline->startTime(RDLogLine::Logged),
"hh:mm:ss")+","+
"ISRC=\""+RDEscapeString(logline->isrc().utf8())+"\","+
"PUBLISHER=\""+RDEscapeString(logline->publisher().utf8())+"\","+
"COMPOSER=\""+RDEscapeString(logline->composer().utf8())+"\","+