2016-07-22 Fred Gleason <fredg@paravelsystems.com>

* Implemented a 'deletelog' command for rdclilogedit(1).

ChangeLog

@@ -15396,3 +15396,5 @@
 	* Fixed a bug in 'utils/rdclilogedit/operations.cpp' where attempting
 	to load a log with mismatched case in the name would generate a SQL
 	error.
+2016-07-22 Fred Gleason <fredg@paravelsystems.com>
+	* Implemented a 'deletelog' command for rdclilogedit(1).

docs/docbook/rdclilogedit.xml

@@ -131,6 +131,18 @@
 	</para>
       </listitem>
     </varlistentry>
+    <varlistentry>
+      <term>
+	<command>deletelog</command>
+	<arg choice="req"><replaceable>log-name</replaceable></arg>
+      </term>
+      <listitem>
+	<para>
+	  Delete the log <replaceable>log-name</replaceable> from the
+	  Rivendell database.
+	</para>
+      </listitem>
+    </varlistentry>
     <varlistentry>
       <term>
 	<command>exit</command>

utils/rdclilogedit/help.cpp

@@ -27,10 +27,10 @@ void MainObject::Help(const QStringList &cmds) const
   if(cmds.size()==1) {
     printf("\n");
     printf("The following commands are available:\n");
-    printf("?, addcart, addchain, addmarker, addtrack, bye, exit, header, help, list,\n");
+    printf("?, addcart, addchain, addmarker, addtrack, bye, deletelog, exit, header, help,\n");
-    printf("listlogs, listservices, load, new, quit, remove, save, saveas, setautorefresh,\n");
+    printf("list, listlogs, listservices, load, new, quit, remove, save, saveas,\n");
-    printf("setcart, setcomment, setdesc, setenddate, setlabel, setpurgedate, setservice,\n");
+    printf("setautorefresh, setcart, setcomment, setdesc, setenddate, setlabel,\n");
-    printf("setstartdate, settime, settrans, unload\n");
+    printf("setpurgedate, setservice, setstartdate, settime, settrans, unload\n");
     printf("\n");
     printf("Enter \"? <cmd-name>\" for specific help.\n");
     printf("\n");
@@ -78,6 +78,14 @@ void MainObject::Help(const QStringList &cmds) const
       printf("\n");
       processed=true;
     }
+    if(verb=="deletelog") {
+      printf("\n");
+      printf("  deletelog <log-name>\n");
+      printf("\n");
+      printf("Delete log <log-name> from the Rivendell database.\n");
+      printf("\n");
+      processed=true;
+    }
     if((verb=="?")||(verb=="help")) {
       printf("\n");
       printf("  %s <cmd-name>\n",(const char *)cmds[1]);

utils/rdclilogedit/operations.cpp

@@ -87,6 +87,43 @@ void MainObject::Addtrack(int line)
 }
 
 
+void MainObject::Deletelog(QString logname)
+{
+  QString sql;
+  RDSqlQuery *q;
+
+  //
+  // Normalize log name case
+  //
+  // FIXME: This should really be handled by use of collations in the
+  //        where clause.
+  //
+  sql=QString("select NAME from LOGS where ")+
+    "NAME=\""+RDEscapeString(logname)+"\"";
+  q=new RDSqlQuery(sql);
+  if(q->first()) {
+    logname=q->value(0).toString();
+  }
+  delete q;
+
+  if((edit_log==NULL)||(edit_log->name()!=logname)) {
+    RDLog *log=new RDLog(logname);
+    if(log->exists()) {
+      if(!log->remove(edit_station,edit_user,edit_config)) {
+	fprintf(stderr,"deletelog: audio deletion error, log not deleted\n");
+      }
+    }
+    else {
+      fprintf(stderr,"deletelog: no such log\n");
+    }
+    delete log;
+  }
+  else {
+    fprintf(stderr,"deletelog: log currently loaded (try \"unload\" first)\n");
+  }
+}
+
+
 void MainObject::Header() const
 {
   printf(" Description: %s\n",(const char *)edit_description);

utils/rdclilogedit/parser.cpp

@@ -45,6 +45,21 @@ void MainObject::DispatchCommand(QString cmd)
   //
   // No loaded log needed for these
   //
+  if(verb=="deletelog") {
+    if(edit_user->deleteLog()) {
+      if(cmds.size()==2) {
+	Deletelog(cmds[1]);
+      }
+      else {
+	fprintf(stderr,"deletelog: invalid command arguments\n");
+      }
+    }
+    else {
+      fprintf(stderr,"deletelog: insufficient privileges [Delete Log]\n");
+    }
+    processed=true;
+  }
+
   if((verb=="exit")||(verb=="quit")||(verb=="bye")) {
     if(overwrite) {
       exit(0);

utils/rdclilogedit/rdclilogedit.cpp

@@ -83,8 +83,9 @@ MainObject::MainObject(QObject *parent)
   new RDDbHeartbeat(edit_config->mysqlHeartbeatInterval(),this);
 
   //
-  // RDAirPlay Configuration
+  // Configuration Objects
   //
+  edit_station=new RDStation(edit_config->stationName());
   edit_airplay_conf=new RDAirPlayConf(edit_config->stationName(),"RDAIRPLAY");
 
   //

utils/rdclilogedit/rdclilogedit.h

@@ -48,6 +48,7 @@ class MainObject : public QObject
   void Addchain(int line,const QString &logname);
   void Addmarker(int line);
   void Addtrack(int line);
+  void Deletelog(QString logname);
   void Header() const;
   void Help(const QStringList &cmds) const;
   void List();
@@ -87,6 +88,7 @@ class MainObject : public QObject
   QDate edit_purge_date;
   bool edit_auto_refresh;
   RDUser *edit_user;
+  RDStation *edit_station;
   RDRipc *edit_ripc;
   RDAirPlayConf *edit_airplay_conf;
   RDConfig *edit_config;