diff --git a/ChangeLog b/ChangeLog index 15a66aea..66916155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24456,3 +24456,6 @@ * Fixed a bug in rdairplay(1) that allowed access to the Voice Tracker even when the current user had the 'Voicetrack Logs' privilege revoked. +2023-11-06 Fred Gleason + * Fixed a bug in rdlogmanager(1) that caused scheduler codes + containing space characters to fail to be processed correctly. diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index 6be22b19..782079b3 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -634,14 +634,14 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, // Load all carts in requested group into schedCL // sql=QString("select `NUMBER`,`ARTIST`,`TITLE`,")+ - "CONCAT(GROUP_CONCAT(RPAD(`SC`.`SCHED_CODE`,11,' ') separator ''),'.') as `SCHED_CODES`"+ + "CONCAT(GROUP_CONCAT(RPAD(`SC`.`SCHED_CODE`,11,'|') separator ''),'.') as `SCHED_CODES`"+ " from `CART` LEFT JOIN `CART_SCHED_CODES` AS `SC` on (`NUMBER`=`SC`.`CART_NUMBER`)"+ " where `GROUP_NAME`='"+RDEscapeString(schedGroup())+"'"+ " group by `NUMBER`"; RDSchedCartList *schedCL=new RDSchedCartList(); q=new RDSqlQuery(sql); while(q->next()) { - QStringList codes=q->value(3).toString().split(" ",QString::SkipEmptyParts); + QStringList codes=q->value(3).toString().split("|",QString::SkipEmptyParts); if((codes.size()>0)&&(codes.last()==".")) { codes.removeLast(); } @@ -649,7 +649,7 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, insertItem(q->value(0).toUInt(),0,0,q->value(1).toString(),q->value(2).toString(),codes); } delete q; - + ////////////////////////////////// // // // Add deconflicting rules here //