Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-04 14:39:09 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Escaped all SQL identifiers in 'utils/rdgpimon/'.
	* Replaced " with ' delimiters in all SQL literal strings in
	'utils/rdgpimon/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-23 12:28:35 -04:00
parent cd898bd868
commit aeb27fb011
2 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21571,3 +21571,7 @@
* Escaped all SQL identifiers in 'utils/rdexport/'. * Escaped all SQL identifiers in 'utils/rdexport/'.
* Replaced " with ' delimiters in all SQL literal strings in * Replaced " with ' delimiters in all SQL literal strings in
'utils/rdexport/'. 'utils/rdexport/'.
2021-04-23 Fred Gleason <fredg@paravelsystems.com>
* Escaped all SQL identifiers in 'utils/rdgpimon/'.
* Replaced " with ' delimiters in all SQL literal strings in
'utils/rdgpimon/'.

73
utils/rdgpimon/rdgpimon.cpp
View File

@ -287,7 +287,6 @@ void MainWidget::matrixActivatedData(int index)
new RDMatrix(rda->config()->stationName(),gpi_matrix_box->currentIndex()); new RDMatrix(rda->config()->stationName(),gpi_matrix_box->currentIndex());
UpdateLabelsDown(0); UpdateLabelsDown(0);
gpi_up_button->setDisabled(true); gpi_up_button->setDisabled(true);
// RefreshEventsList();
gpi_events_model-> gpi_events_model->
setGpioType((RDMatrix::GpioType)gpi_type_box->currentIndex()); setGpioType((RDMatrix::GpioType)gpi_type_box->currentIndex());
gpi_events_model->setMatrixNumber(index); gpi_events_model->setMatrixNumber(index);
@ -328,22 +327,22 @@ void MainWidget::eventsReportData()
report+="\n"; report+="\n";
sql=QString("select ")+ sql=QString("select ")+
"EVENT_DATETIME,"+ // 00 "`EVENT_DATETIME`,"+ // 00
"NUMBER,"+ // 01 "`NUMBER`,"+ // 01
"EDGE "+ // 02 "`EDGE` "+ // 02
"from GPIO_EVENTS where "+ "from `GPIO_EVENTS` where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\")&&"+ "(`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"')&&"+
QString().sprintf("(MATRIX=%d)&&",gpi_matrix_box->currentIndex())+ QString().sprintf("(`MATRIX`=%d)&&",gpi_matrix_box->currentIndex())+
QString().sprintf("(TYPE=%d)&&",gpi_type_box->currentIndex())+ QString().sprintf("(`TYPE`=%d)&&",gpi_type_box->currentIndex())+
"(EVENT_DATETIME>=\""+gpi_events_date_edit->date().toString("yyyy-MM-dd")+ "(`EVENT_DATETIME`>='"+gpi_events_date_edit->date().toString("yyyy-MM-dd")+
" 00:00:00\")&&"+ " 00:00:00')&&"+
"(EVENT_DATETIME<\""+gpi_events_date_edit->date().addDays(1). "(`EVENT_DATETIME`<'"+gpi_events_date_edit->date().addDays(1).
toString("yyyy-MM-dd")+" 00:00:00\")"; toString("yyyy-MM-dd")+" 00:00:00')";
if(gpi_events_state_box->currentIndex()==0) { if(gpi_events_state_box->currentIndex()==0) {
sql+="&&(EDGE=1)"; sql+="&&(`EDGE`=1)";
} }
if(gpi_events_state_box->currentIndex()==1) { if(gpi_events_state_box->currentIndex()==1) {
sql+="&&(EDGE=0)"; sql+="&&(`EDGE`=0)";
} }
report+=" -- Time -- - Line - - State -\n"; report+=" -- Time -- - Line - - State -\n";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
@ -528,29 +527,29 @@ void MainWidget::UpdateLabelsUp(int last_line)
int count=0; int count=0;
int count_limit=GPIMON_ROWS*GPIMON_COLS; int count_limit=GPIMON_ROWS*GPIMON_COLS;
bool last_updated=false; bool last_updated=false;
QString tablename="GPIS"; QString tablename="`GPIS`";
for(int i=0;i<(GPIMON_ROWS*GPIMON_COLS);i++) { for(int i=0;i<(GPIMON_ROWS*GPIMON_COLS);i++) {
gpi_labels[i]->hide(); gpi_labels[i]->hide();
} }
switch((RDMatrix::GpioType)gpi_type_box->currentIndex()) { switch((RDMatrix::GpioType)gpi_type_box->currentIndex()) {
case RDMatrix::GpioInput: case RDMatrix::GpioInput:
tablename="GPIS"; tablename="`GPIS`";
break; break;
case RDMatrix::GpioOutput: case RDMatrix::GpioOutput:
tablename="GPOS"; tablename="`GPOS`";
break; break;
} }
sql=QString("select ")+ sql=QString("select ")+
"NUMBER,"+ // 00 "`NUMBER`,"+ // 00
"OFF_MACRO_CART,"+ // 01 "`OFF_MACRO_CART`,"+ // 01
"MACRO_CART "+ // 02 "`MACRO_CART` "+ // 02
"from "+tablename+" where "+ "from "+tablename+" where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\")&&"+ "(`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"')&&"+
QString().sprintf("(MATRIX=%d)&&",gpi_matrix->matrix())+ QString().sprintf("(`MATRIX`=%d)&&",gpi_matrix->matrix())+
QString().sprintf("(NUMBER<=%d) ",last_line)+ QString().sprintf("(`NUMBER`<=%d) ",last_line)+
"order by NUMBER desc"; "order by `NUMBER` desc";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->size()<count_limit) { if(q->size()<count_limit) {
count_limit=q->size(); count_limit=q->size();
@ -580,29 +579,29 @@ void MainWidget::UpdateLabelsDown(int first_line)
RDSqlQuery *q; RDSqlQuery *q;
int count=0; int count=0;
bool first_updated=false; bool first_updated=false;
QString tablename="GPIS"; QString tablename="`GPIS`";
for(int i=0;i<(GPIMON_ROWS*GPIMON_COLS);i++) { for(int i=0;i<(GPIMON_ROWS*GPIMON_COLS);i++) {
gpi_labels[i]->hide(); gpi_labels[i]->hide();
} }
switch((RDMatrix::GpioType)gpi_type_box->currentIndex()) { switch((RDMatrix::GpioType)gpi_type_box->currentIndex()) {
case RDMatrix::GpioInput: case RDMatrix::GpioInput:
tablename="GPIS"; tablename="`GPIS`";
break; break;
case RDMatrix::GpioOutput: case RDMatrix::GpioOutput:
tablename="GPOS"; tablename="`GPOS`";
break; break;
} }
sql=QString("select ")+ sql=QString("select ")+
"NUMBER,"+ // 00 "`NUMBER`,"+ // 00
"OFF_MACRO_CART,"+ // 01 "`OFF_MACRO_CART`,"+ // 01
"MACRO_CART "+ // 02 "`MACRO_CART` "+ // 02
"from "+tablename+" where "+ "from "+tablename+" where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\")&&"+ "(`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"')&&"+
QString().sprintf("(MATRIX=%d)&&",gpi_matrix->matrix())+ QString().sprintf("(`MATRIX`=%d)&&",gpi_matrix->matrix())+
QString().sprintf("(NUMBER>=%d) ",first_line)+ QString().sprintf("(`NUMBER`>=%d) ",first_line)+
"order by NUMBER"; "order by `NUMBER`";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()&&(count<(GPIMON_ROWS*GPIMON_COLS))) { while(q->next()&&(count<(GPIMON_ROWS*GPIMON_COLS))) {
gpi_labels[count]->setCart(q->value(1).toUInt(),q->value(2).toUInt()); gpi_labels[count]->setCart(q->value(1).toUInt(),q->value(2).toUInt());
@ -618,9 +617,9 @@ void MainWidget::UpdateLabelsDown(int first_line)
sql=QString("select ")+ sql=QString("select ")+
tablename+" "+ // 00 tablename+" "+ // 00
"from MATRICES where "+ "from `MATRICES` where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\") && "+ "(`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"') && "+
QString().sprintf("(MATRIX=%d)",gpi_matrix->matrix()); QString().sprintf("(`MATRIX`=%d)",gpi_matrix->matrix());
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
for(int i=0;i<(GPIMON_ROWS*GPIMON_COLS);i++) { for(int i=0;i<(GPIMON_ROWS*GPIMON_COLS);i++) {