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

2018-07-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up SQL quieries in 'ripcd/' to ensure UTF-8
	compatibility.
This commit is contained in:
Fred Gleason
2018-07-18 20:58:22 +00:00
parent 6e2b2a7e0b
commit f7bae36307
12 changed files with 215 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ripcd/local_macros.cpp
View File

@@ -161,9 +161,14 @@ void MainObject::LoadLocalMacros()
//
// Initialize Matrices
//
sql=QString().sprintf("select MATRIX,TYPE,PORT,INPUTS,OUTPUTS from MATRICES \
where STATION_NAME=\"%s\"",
(const char *)rda->station()->name());
sql=QString("select ")+
"MATRIX,"+ // 00
"TYPE,"+ // 01
"PORT,"+ // 02
"INPUTS,"+ // 03
"OUTPUTS "+ // 04
"from MATRICES where "+
"STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\"";
q=new RDSqlQuery(sql);
while(q->next()) {
if(!LoadSwitchDriver(q->value(0).toInt())) {
@@ -177,10 +182,16 @@ void MainObject::LoadLocalMacros()
//
// Initialize TTYs
//
sql=QString().sprintf("select PORT_ID,PORT,BAUD_RATE,DATA_BITS,PARITY,\
TERMINATION from TTYS where (STATION_NAME=\"%s\")&&\
(ACTIVE=\"Y\")",
(const char *)rda->station()->name());
sql=QString("select ")+
"PORT_ID,"+ // 00
"PORT,"+ // 01
"BAUD_RATE,"+ // 02
"DATA_BITS,"+ // 03
"PARITY,"+ // 04
"TERMINATION "+ // 05
"from TTYS where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\")&&"+
"(ACTIVE=\"Y\")";
q=new RDSqlQuery(sql);
while(q->next()) {
tty_port=q->value(0).toUInt();
@@ -778,10 +789,17 @@ void MainObject::RunLocalMacros(RDMacro *rml)
//
// Try to Restart
//
sql=QString().sprintf("select PORT_ID,PORT,BAUD_RATE,DATA_BITS,PARITY,\
TERMINATION from TTYS where (STATION_NAME=\"%s\")&& \
(ACTIVE=\"Y\")&&(PORT_ID=%d)",
(const char *)rda->station()->name(),tty_port);
sql=QString("select ")+
"PORT_ID,"+ // 00
"PORT,"+ // 01
"BAUD_RATE,"+ // 02
"DATA_BITS,"+ // 03
"PARITY,"+ // 04
"TERMINATION "+ // 05
"from TTYS where "+
"(STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\")&&"+
"(ACTIVE=\"Y\")&&"+
QString().sprintf("(PORT_ID=%d)",tty_port);
q=new RDSqlQuery(sql);
if(q->first()) {
if(!ripcd_tty_inuse[tty_port]) {