2017-12-27 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug that broke generation of the 'RULES' table when creating
	a new clock in rdlogmanager(1).
This commit is contained in:
Fred Gleason 2017-12-27 18:40:57 -05:00
parent 345ed93a26
commit 8ee03d9fd6
3 changed files with 11 additions and 5 deletions

View File

@ -16521,3 +16521,6 @@
* Updated 'INSTALL'.
* Updated 'NEWS'.
* Incremented the package version to 2.18.1.
2017-12-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that broke generation of the 'RULES' table when creating
a new clock in rdlogmanager(1).

View File

@ -28,9 +28,11 @@ SchedRulesList::SchedRulesList(QString clockname,RDConfig *config)
QString sql;
RDSqlQuery *q;
RDSqlQuery *q1;
QString clkname=clockname;
clkname.replace(" ","_");
sql=QString("create table if not exists `")+
RDClock::tableName(clockname)+"_RULES` ("+
clkname+"_RULES` ("+
"CODE varchar(10) not null primary key,"+
"MAX_ROW int unsigned,"+
"MIN_WAIT int unsigned,"+

View File

@ -226,8 +226,8 @@ void ListClocks::addData()
return;
}
delete add_dialog;
sql=QString().sprintf("select NAME from CLOCKS where NAME=\"%s\"",
(const char *)clockname);
sql=QString("select NAME from CLOCKS where ")+
"NAME=\""+RDEscapeString(clockname)+"\"";
q=new RDSqlQuery(sql);
if(q->first()) {
QMessageBox::
@ -237,8 +237,9 @@ void ListClocks::addData()
return;
}
delete q;
sql=QString().sprintf("insert into CLOCKS set NAME=\"%s\",ARTISTSEP=15",
(const char *)clockname);
sql=QString("insert into CLOCKS set ")+
"NAME=\""+RDEscapeString(clockname)+"\","+
"ARTISTSEP=15";
q=new RDSqlQuery(sql);
delete q;
sql=RDCreateClockTableSql(RDClock::tableName(clockname),log_config);