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

2021-04-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed typo in 'lib/export_radiotraffic.cpp' that caused SQL
	errors.
	* Fixed typo in 'lib/rdlog_line.cpp' that caused SQL
	errors.
	* Fixed typo in 'lib/rdlogmodel.cpp' that caused SQL
	errors.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-26 09:34:18 -04:00
parent a217f43d09
commit a1c4026a5f
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -21597,3 +21597,10 @@
'web/webget/'.
2021-04-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed security warnings when build under Debian.
2021-04-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed typo in 'lib/export_radiotraffic.cpp' that caused SQL
errors.
* Fixed typo in 'lib/rdlog_line.cpp' that caused SQL
errors.
* Fixed typo in 'lib/rdlogmodel.cpp' that caused SQL
errors.

2
lib/export_radiotraffic.cpp
View File

@ -63,7 +63,7 @@ bool RDReport::ExportRadioTraffic(const QString &filename,
air_fmt=QString().sprintf("%%%-uu ",cartDigits());
}
sql=QString("select ")+
"`ELR_LINES`.`LENGTH,"+ // 00
"`ELR_LINES`.`LENGTH`,"+ // 00
"`ELR_LINES`.`CART_NUMBER`,"+ // 01
"`ELR_LINES`.`EVENT_DATETIME`,"+ // 02
"`ELR_LINES`.`EVENT_TYPE`,"+ // 03

2
lib/rdlog_line.cpp
View File

@ -1831,7 +1831,7 @@ RDLogLine::State RDLogLine::setEvent(int mach,RDLogLine::TransType next_type,
}
log_cut_number=log_cut_name.right(3).toInt();
sql=QString("select ")+
"`LENGTH,"+ // 00
"`LENGTH`,"+ // 00
"`START_POINT`,"+ // 01
"`END_POINT`,"+ // 02
"`SEGUE_START_POINT`,"+ // 03

14
lib/rdlogmodel.cpp
View File

@ -359,9 +359,9 @@ int RDLogModel::validate(QString *report,const QDate &date)
sql=QString("select `CUT_NAME` from `CUTS` where ")+
QString().sprintf("(`CART_NUMBER`=%u)&&",logLine(i)->cartNumber())+
"((`START_DATETIME` is null)||"+
"(`START_DATETIME`<=\""+date.toString("yyyy-MM-dd")+" 23:59:59\"))&&"+
"(`START_DATETIME`<='"+date.toString("yyyy-MM-dd")+" 23:59:59'))&&"+
"((`END_DATETIME` is null)||"+
"(`END_DATETIME`>=\""+date.toString("yyyy-MM-dd")+" 00:00:00\"))&&"+
"(`END_DATETIME`>='"+date.toString("yyyy-MM-dd")+" 00:00:00'))&&"+
"("+RDDowCode(date.dayOfWeek())+"='Y')&&(LENGTH>0)";
}
else {
@ -383,7 +383,7 @@ int RDLogModel::validate(QString *report,const QDate &date)
"((`END_DAYPART` is null)||"+
"(`END_DAYPART`>='"+logLine(i)->startTime(RDLogLine::Logged).
toString("hh:mm:ss")+"'))&&"+
"("+RDDowCode(date.dayOfWeek())+"=\"Y\")&&(LENGTH>0)";
"("+RDDowCode(date.dayOfWeek())+"='Y')&&(LENGTH>0)";
}
q1=new RDSqlQuery(sql);
if(!q1->first()) {
@ -1056,7 +1056,7 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
"`CART`.`LAST_CUT_PLAYED`,"+ // 23
"`CART`.`PLAY_ORDER`,"+ // 24
"`CART`.`ENFORCE_LENGTH`,"+ // 25
"`CART`.`PRESERVE_PITCH `,"+ // 26
"`CART`.`PRESERVE_PITCH`,"+ // 26
"`LOG_LINES`.`TYPE`,"+ // 27
"`LOG_LINES`.`COMMENT`,"+ // 28
"`LOG_LINES`.`LABEL`,"+ // 29
@ -1093,13 +1093,13 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs)
"`CART`.`START_DATETIME`,"+ // 60
"`CART`.`END_DATETIME`,"+ // 61
"`LOG_LINES`.`EVENT_LENGTH`,"+ // 62
"`CART`.`USE_EVENT_LENGTH',"+ // 63
"`CART`.`USE_EVENT_LENGTH`,"+ // 63
"`CART`.`NOTES` "+ // 64
"from `LOG_LINES` left join `CART` "+
"on `LOG_LINES`.`CART_NUMBER`=`CART`.`NUMBER` where "+
"`LOG_LINES`.`LOG_NAME`=\""+RDEscapeString(logname)+"\" "+
"`LOG_LINES`.`LOG_NAME`='"+RDEscapeString(logname)+"' "+
"order by `COUNT`";
q=new RDSqlQuery(sql);
q=new RDSqlQuery(sql);
if(q->size()<=0) {
delete q;
return 0;