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

* Added log locking logic to rdairplay(1).
	* Fixed a bug that broke generation of the 'RULES' table when creating
	a new clock in rdlogmanager(1).

ChangeLog

@@ -16552,3 +16552,5 @@
 	* Added a lock check for before deleting logs in rdclilogedit(1).
 2017-12-27 Fred Gleason <fredg@paravelsystems.com>
 	* Added log locking logic to rdairplay(1).
+	* Fixed a bug that broke generation of the 'RULES' table when creating
+	a new clock in rdlogmanager(1).

NEWS

@@ -1,5 +1,20 @@
 The NEWS file for the Rivendell package.
 
+-------------------------------------------------------------------------------
+v2.18.2 -- 12/29/2017
+
+Changes:
+   Fixed a bug that caused creation of new clocks in rdlogmanager(1) to
+   fail to initialize music scheduler components correctly in the database.
+
+Database Update:
+   This version of Rivendell uses database schema version 272, and will
+   automatically upgrade any earlier versions.  To see the current schema
+   version prior to upgrade, see RDAdmin->SystemInfo.
+
+   As always, be sure to run RDAdmin immediately after upgrading to allow 
+   any necessary changes to the database schema to be applied.
+
 -------------------------------------------------------------------------------
 v2.18.1 -- 12/22/2017
 

PACKAGE_VERSION

@@ -1 +1 @@
-2.18.1
+2.18.2

lib/schedruleslist.cpp

@@ -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,"+

rdlogmanager/list_clocks.cpp

@@ -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);