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

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

Browse Source 
* Fixed various regressions in rdadmin(1) that caused SQL errors.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-19 17:41:59 -04:00
parent fdbf5fa164
commit 8634c926d2
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21475,3 +21475,5 @@
* Fixed regression in 'RDAudioPorts' that caused SQL errors. * Fixed regression in 'RDAudioPorts' that caused SQL errors.
2021-04-19 Fred Gleason <fredg@paravelsystems.com> 2021-04-19 Fred Gleason <fredg@paravelsystems.com>
* Fixed regression in 'RDStation' that caused SQL errors. * Fixed regression in 'RDStation' that caused SQL errors.
2021-04-19 Fred Gleason <fredg@paravelsystems.com>
* Fixed various regressions in rdadmin(1) that caused SQL errors.

2
lib/rdcatch_conf.cpp
View File

@ -68,7 +68,7 @@ void RDCatchConf::SetRow(const QString &param,const QString &value) const
QString sql; QString sql;
sql=QString("update `RDCATCH` set `")+ sql=QString("update `RDCATCH` set `")+
param+"`='"+RDEscapeString(value)+"\" where "+ param+"`='"+RDEscapeString(value)+"' where "+
"`STATION`='"+RDEscapeString(air_station)+"'"; "`STATION`='"+RDEscapeString(air_station)+"'";
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
} }

2
lib/rdstation.cpp
View File

@ -1864,7 +1864,7 @@ void RDStation::remove(const QString &name)
{ {
QString sql; QString sql;
sql=QString("delete from `DECKS where ")+ sql=QString("delete from `DECKS` where ")+
"`STATION_NAME`='"+RDEscapeString(name)+"'"; "`STATION_NAME`='"+RDEscapeString(name)+"'";
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);

2
rdadmin/edit_gpi.cpp
View File

@ -188,7 +188,7 @@ int EditGpi::exec(RDMatrix::GpioType type,int id)
QString sql=QString("select ")+ QString sql=QString("select ")+
edit_table+".`NUMBER`,"+ // 00 edit_table+".`NUMBER`,"+ // 00
edit_table+".`MACRO_CART`,"+ // 01 edit_table+".`MACRO_CART`,"+ // 01
"`CART.TITLE` "+ // 02 "`CART`.`TITLE` "+ // 02
"from "+edit_table+" "+ "from "+edit_table+" "+
"left join `CART` "+ "left join `CART` "+
"on "+edit_table+".`MACRO_CART`=`CART`.`NUMBER` where "+ "on "+edit_table+".`MACRO_CART`=`CART`.`NUMBER` where "+

12
rdadmin/edit_matrix.cpp
View File

@ -1378,14 +1378,14 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type)
if(!RDMatrix::controlActive(edit_matrix->type(), if(!RDMatrix::controlActive(edit_matrix->type(),
RDMatrix::DynamicGpioControl)) { RDMatrix::DynamicGpioControl)) {
for(int i=0;i<line_quan;i++) { for(int i=0;i<line_quan;i++) {
sql=QString("select `ID` from `")+tablename+ sql=QString("select `ID` from ")+tablename+
"` where (`STATION_NAME`='"+RDEscapeString(edit_stationname)+"')&&"+ " where (`STATION_NAME`='"+RDEscapeString(edit_stationname)+"')&&"+
QString().sprintf("(`MATRIX`=%d)&&(`NUMBER`=%d)", QString().sprintf("(`MATRIX`=%d)&&(`NUMBER`=%d)",
edit_matrix_number,i+1); edit_matrix_number,i+1);
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(!q->first()) { if(!q->first()) {
sql=QString("insert into `")+tablename+ sql=QString("insert into ")+tablename+
"` set `STATION_NAME`='"+RDEscapeString(edit_stationname)+"',"+ " set `STATION_NAME`='"+RDEscapeString(edit_stationname)+"',"+
QString().sprintf("`MATRIX`=%d,`NUMBER`=%d,`MACRO_CART`=0", QString().sprintf("`MATRIX`=%d,`NUMBER`=%d,`MACRO_CART`=0",
edit_matrix_number,i+1); edit_matrix_number,i+1);
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
@ -1396,8 +1396,8 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type)
// //
// Purge Stale Entries // Purge Stale Entries
// //
sql=QString("delete from `")+tablename+ sql=QString("delete from ")+tablename+
"` where (`STATION_NAME`='"+RDEscapeString(edit_stationname)+ " where (`STATION_NAME`='"+RDEscapeString(edit_stationname)+
QString().sprintf("')&&(`MATRIX`=%d)&&(`NUMBER`>%d)", QString().sprintf("')&&(`MATRIX`=%d)&&(`NUMBER`>%d)",
edit_matrix_number,line_quan); edit_matrix_number,line_quan);
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);