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

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -16521,3 +16521,6 @@
* Updated 'INSTALL'. * Updated 'INSTALL'.
* Updated 'NEWS'. * Updated 'NEWS'.
* Incremented the package version to 2.18.1. * 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).

4
lib/schedruleslist.cpp
View File

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

9
rdlogmanager/list_clocks.cpp
View File

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