2018-01-09 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug that caused rdlogmanager(1) to throw a SQL error when
	deleting a clock.
This commit is contained in:
Fred Gleason 2018-01-09 08:50:35 -05:00
parent 69452ffb50
commit 60cf7b681c
2 changed files with 5 additions and 2 deletions

View File

@ -16566,3 +16566,6 @@
2018-01-08 Fred Gleason <fredg@paravelsystems.com>
* Updated 'NEWS'.
* Incremented the package version to 2.18.2int00.
2018-01-09 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that caused rdlogmanager(1) to throw a SQL error when
deleting a clock.

View File

@ -584,7 +584,7 @@ int ListClocks::ActiveClocks(QString clockname,QString *svc_list)
QStringList svcs;
sql=QString("select SERVICE_NAME from SERVICE_CLOCKS where ")+
"CLOCK=\""+RDEscapeString(clockname)+"\" order by CLOCK";
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\" order by CLOCK_NAME";
q=new RDSqlQuery(sql);
while(q->next()) {
if((svcs.size()==0)||(svcs.back()!=q->value(0).toString())) {
@ -612,7 +612,7 @@ void ListClocks::DeleteClock(QString clockname)
// Delete Active Clocks
//
sql=QString("delete from SERVICE_CLOCKS where ")+
"CLOCK=\""+RDEscapeString(clockname)+"\"";
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
q=new RDSqlQuery(sql);
delete q;