Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 14:43:30 +02:00
Code Issues Projects Releases Wiki Activity

2023-11-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdlogmanager(1) that caused scheduler codes
	containing space characters to fail to be processed correctly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2023-11-06 17:10:13 -05:00
parent 906bd1446c
commit ef7084a073
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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 <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that caused scheduler codes
containing space characters to fail to be processed correctly.

6
lib/rdevent_line.cpp
View File

@ -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 //