Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-23 16:08:15 +02:00
Code Issues Projects Releases Wiki Activity

2019-12-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed dead code from 'lib/rdevent_line.cpp'.
This commit is contained in:
Fred Gleason 2019-12-13 12:30:34 -05:00
parent c87524819b
commit 755a84604f
2 changed files with 12 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -19342,3 +19342,5 @@
start times even when the references cart does not exist. start times even when the references cart does not exist.
2019-12-11 Fred Gleason <fredg@paravelsystems.com> 2019-12-11 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.0int6. * Incremented the package version to 3.2.0int6.
2019-12-13 Fred Gleason <fredg@paravelsystems.com>
* Removed dead code from 'lib/rdevent_line.cpp'.

54
lib/rdevent_line.cpp
View File

@ -538,16 +538,16 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
// //
if(event_import_source==RDEventLine::Traffic || event_import_source==RDEventLine::Music) { if(event_import_source==RDEventLine::Traffic || event_import_source==RDEventLine::Music) {
switch(event_import_source) { switch(event_import_source) {
case RDEventLine::Traffic: case RDEventLine::Traffic:
link_type=RDLogLine::TrafficLink; link_type=RDLogLine::TrafficLink;
break; break;
case RDEventLine::Music: case RDEventLine::Music:
link_type=RDLogLine::MusicLink; link_type=RDLogLine::MusicLink;
break; break;
default: default:
break; break;
} }
QTime end_start_time=event_start_time.addMSecs(event_length); QTime end_start_time=event_start_time.addMSecs(event_length);
@ -757,14 +757,9 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
"from STACK_LINES left join STACK_SCHED_CODES "+ "from STACK_LINES left join STACK_SCHED_CODES "+
"on STACK_LINES.ID=STACK_SCHED_CODES.STACK_LINES_ID where "+ "on STACK_LINES.ID=STACK_SCHED_CODES.STACK_LINES_ID where "+
"STACK_LINES.SERVICE_NAME=\""+RDEscapeString(svcname)+"\" && "+ "STACK_LINES.SERVICE_NAME=\""+RDEscapeString(svcname)+"\" && "+
QString().sprintf("STACK_LINES.SCHED_STACK_ID > %d && ",stackid-range)+ QString().sprintf("STACK_LINES.SCHED_STACK_ID > %d && ",
stackid-range)+
"STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\""; "STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\"";
/*
sql=QString("select CART from STACK_LINES where ")+
"SERVICE_NAME=\""+RDEscapeString(svcname)+"\" && "+
QString().sprintf("SCHED_STACK_ID > %d && ",stackid-range)+
"SCHED_CODES like \"%%"+RDEscapeString(wstr)+"%%\"";
*/
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
if(q1->size()>=allowed || allowed==0) { if(q1->size()>=allowed || allowed==0) {
for(counter=0;counter<schedCL->getNumberOfItems();counter++) { for(counter=0;counter<schedCL->getNumberOfItems();counter++) {
@ -793,12 +788,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
"STACK_LINES.SERVICE_NAME=\""+RDEscapeString(svcname)+"\" && "+ "STACK_LINES.SERVICE_NAME=\""+RDEscapeString(svcname)+"\" && "+
QString().sprintf("STACK_LINES.SCHED_STACK_ID=%d && ",stackid-1)+ QString().sprintf("STACK_LINES.SCHED_STACK_ID=%d && ",stackid-1)+
"STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\""; "STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\"";
/*
sql=QString("select CART from STACK_LINES where ")+
"SERVICE_NAME=\""+RDEscapeString(svcname)+"\" && "+
QString().sprintf("SCHED_STACK_ID=%d && ",stackid-1)+
"SCHED_CODES like \"%"+RDEscapeString(wstr)+"%\"";
*/
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
if(q1->size()>0) { if(q1->size()>0) {
for(counter=0;counter<schedCL->getNumberOfItems();counter++) { for(counter=0;counter<schedCL->getNumberOfItems();counter++) {
@ -827,11 +816,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
"on STACK_LINES.ID=STACK_SCHED_CODES.STACK_LINES_ID where "+ "on STACK_LINES.ID=STACK_SCHED_CODES.STACK_LINES_ID where "+
QString().sprintf("STACK_LINES.SCHED_STACK_ID=%d && ",stackid-1)+ QString().sprintf("STACK_LINES.SCHED_STACK_ID=%d && ",stackid-1)+
"STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\""; "STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\"";
/*
sql=QString("select CART from STACK_LINES where ")+
QString().sprintf("SCHED_STACK_ID=%d && ",stackid-1)+
"SCHED_CODES like \"%"+RDEscapeString(wstr)+"%\"";
*/
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
if(q1->size()>0) { if(q1->size()>0) {
for(counter=0;counter<schedCL->getNumberOfItems();counter++) { for(counter=0;counter<schedCL->getNumberOfItems();counter++) {
@ -860,11 +844,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
"on STACK_LINES.ID=STACK_SCHED_CODES.STACK_LINES_ID where "+ "on STACK_LINES.ID=STACK_SCHED_CODES.STACK_LINES_ID where "+
QString().sprintf("STACK_LINES.SCHED_STACK_ID=%d && ",stackid-1)+ QString().sprintf("STACK_LINES.SCHED_STACK_ID=%d && ",stackid-1)+
"STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\""; "STACK_SCHED_CODES.SCHED_CODE=\""+RDEscapeString(wstr)+"\"";
/*
sql=QString("select CART from STACK_LINES where ")+
QString().sprintf("SCHED_STACK_ID=%d && ",stackid-1)+
"SCHED_CODES like \"%"+RDEscapeString(wstr)+"%\"";
*/
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
if(q1->size()>0) { if(q1->size()>0) {
for(counter=0;counter<schedCL->getNumberOfItems();counter++) { for(counter=0;counter<schedCL->getNumberOfItems();counter++) {
@ -928,19 +907,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
"SCHED_CODE=\""+RDEscapeString(codes.at(i))+"\""; "SCHED_CODE=\""+RDEscapeString(codes.at(i))+"\"";
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
} }
/*
sql=QString("insert into STACK_LINES set ")+
"SERVICE_NAME=\""+RDEscapeString(svcname)+"\","+
"SCHEDULED_AT=now(),"+
QString().sprintf("SCHED_STACK_ID=%u,",stackid)+
QString().sprintf("CART=%u,",schedCL->getItemCartNumber(schedpos))+
"ARTIST=\""+RDEscapeString(schedCL->getItemArtist(schedpos))+"\","+
"SCHED_CODES=\""+RDEscapeString(schedCL->getItemSchedCodes(schedpos))+
"\"";
q=new RDSqlQuery(sql);
delete q;
*/
delete schedCL; delete schedCL;
} }
else { else {