Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-23 16:08:15 +02:00
Code Issues Projects Releases Wiki Activity

2018-05-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored table drops to use 'RDApplication::dropTable()'.
This commit is contained in:
Fred Gleason 2018-05-31 19:11:16 +00:00
parent c6bbac7267
commit 84430a10ef
13 changed files with 58 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17000,3 +17000,5 @@
be generated with the incorrect sample rate.
2018-05-31 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up SQL errors in rdadmin(1).
2018-05-31 Fred Gleason <fredg@paravelsystems.com>
* Refactored table drops to use 'RDApplication::dropTable()'.

15
lib/rdfeedlog.cpp
View File

@ -2,7 +2,7 @@
//
// Functions for manipulating RSS feed log tables.
//
// (C) Copyright 2007,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2007,2016-2018 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -20,9 +20,11 @@
#include <qdatetime.h>
#include <rdweb.h>
#include <rdapplication.h>
#include <rddb.h>
#include <rdfeedlog.h>
#include <rdweb.h>
#include "rdfeedlog.h"
void RDCreateFeedLog(QString keyname)
{
@ -44,13 +46,8 @@ void RDCreateFeedLog(QString keyname)
void RDDeleteFeedLog(QString keyname)
{
QString sql;
RDSqlQuery *q;
keyname.replace(" ","_");
sql=QString().sprintf("drop table %s_FLG",(const char *)keyname);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(keyname+"_FLG");
}

7
lib/rdlog.cpp
View File

@ -20,6 +20,7 @@
#include <qobject.h>
#include "rdapplication.h"
#include "rddb.h"
#include "rdconf.h"
#include "rdcreate_log.h"
@ -354,9 +355,9 @@ bool RDLog::remove(RDStation *station,RDUser *user,RDConfig *config) const
if(removeTracks(station,user,config)<0) {
return false;
}
sql=QString("drop table `")+RDLog::tableName(log_name)+"`";
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(RDLog::tableName(log_name));
sql=QString().sprintf("delete from LOGS where (NAME=\"%s\" && TYPE=0)",
(const char *)RDEscapeString(log_name));
q=new RDSqlQuery(sql);

5
lib/rdlog_event.cpp
View File

@ -19,6 +19,7 @@
//
#include <map>
#include <rdapplication.h>
#include <rddb.h>
#include <rdconf.h>
#include <rdlog.h>
@ -150,9 +151,7 @@ void RDLogEvent::save(RDConfig *config,bool update_tracks,int line)
}
if(line<0) {
if(exists()) {
sql=QString().sprintf("drop table `%s`",(const char *)log_name);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(log_name);
}
RDCreateLogTable(log_name,config);
if (log_line.size() > 0) {

26
lib/rdreport.cpp
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Report Descriptor
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -23,14 +23,13 @@
#include <qfile.h>
#include <qobject.h>
#include <rdconf.h>
#include <rdreport.h>
#include <rdcreate_log.h>
#include <rdlog_line.h>
#include <rdescape_string.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rddatedecode.h>
#include "rdapplication.h"
#include "rdconf.h"
#include "rdcreate_log.h"
#include "rddatedecode.h"
#include "rdescape_string.h"
#include "rdlog_line.h"
#include "rdreport.h"
RDReport::RDReport(const QString &rptname,RDStation *station,RDConfig *config,
QObject *parent)
@ -437,10 +436,7 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate,
// Create Table
//
QString mixname="MIXDOWN"+station->name();
sql=QString("drop table `")+mixname+"_SRT`";
QSqlQuery *p;
p=new QSqlQuery(sql);
delete p;
rda->dropTable(mixname+"_SRT");
sql=RDCreateReconciliationTableSql(mixname+"_SRT",report_config);
q=new RDSqlQuery(sql);
delete q;
@ -696,9 +692,7 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate,
#endif
system(post_cmd);
// printf("MIXDOWN TABLE: %s_SRT\n",(const char *)mixname);
sql=QString().sprintf("drop table `%s_SRT`",(const char *)mixname);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(mixname+"_SRT");
return ret;
}

42
lib/rdsvc.cpp
View File

@ -2,7 +2,7 @@
//
// Abstract a Rivendell Service.
//
// (C) Copyright 2002-2004,2016-2017 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -20,17 +20,17 @@
#include <qmessagebox.h>
#include <rdapplication.h>
#include <rdclock.h>
#include <rdconf.h>
#include <rdcreate_log.h>
#include <rddatedecode.h>
#include <rddb.h>
#include <rd.h>
#include <rdescape_string.h>
#include <rdlog.h>
#include <rdsvc.h>
#include <rdweb.h>
#include "rdapplication.h"
#include "rdclock.h"
#include "rdconf.h"
#include "rdcreate_log.h"
#include "rddatedecode.h"
#include "rddb.h"
#include "rd.h"
#include "rdescape_string.h"
#include "rdlog.h"
#include "rdsvc.h"
#include "rdweb.h"
//
// Global Classes
@ -516,10 +516,7 @@ bool RDSvc::import(ImportSource src,const QDate &date,const QString &break_str,
//
// Setup Data Source and Destination
//
sql=QString().sprintf("drop table `%s`",(const char *)dest_table);
QSqlQuery *qq; // Use QSqlQuery so we don't generate a
qq=new QSqlQuery(sql); // spurious error message.
delete qq;
rda->dropTable(dest_table);
sql=QString("create table ")+
"`"+dest_table+"` ("+
"ID int primary key,"+
@ -976,9 +973,7 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
delete dest_event;
// printf("Import Table: %s\n",(const char *)import_name);
sql=QString().sprintf("drop table `%s`",(const char *)import_name);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(import_name);
delete log_lock;
return true;
@ -1399,7 +1394,6 @@ void RDSvc::remove(const QString &name)
{
QString sql;
RDSqlQuery *q;
RDSqlQuery *q1;
QString logname;
sql=QString("delete from AUDIO_PERMS where ")+
@ -1454,12 +1448,8 @@ void RDSvc::remove(const QString &name)
while(q->next()) {
logname=q->value(0).toString();
logname.replace(" ","_");
sql=QString("drop table `")+RDLog::tableName(logname)+"`";
q1=new RDSqlQuery(sql);
delete q1;
sql=QString().sprintf("drop table `%s_REC`",(const char *)logname);
q1=new RDSqlQuery(sql);
delete q1;
rda->dropTable(RDLog::tableName(logname));
rda->dropTable(logname+"_REC");
}
delete q;

8
rdadmin/list_feeds.cpp
View File

@ -173,9 +173,7 @@ void ListFeeds::addData()
delete q;
RDDeleteFeedLog(feed);
feed.replace(" ","_");
sql=QString().sprintf("drop table %s_FIELDS",(const char *)feed);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(feed+"_FIELDS");
delete edit_feed;
return;
}
@ -278,9 +276,7 @@ void ListFeeds::deleteData()
delete q;
RDDeleteFeedLog(feedname);
feedname.replace(" ","_");
sql=QString().sprintf("drop table %s_FIELDS",(const char *)feedname);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(feedname+"_FIELDS");
item->setSelected(false);
pd->reset();

7
rdadmin/rdadmin.cpp
View File

@ -512,15 +512,10 @@ void MainWidget::quitMainWidget()
void MainWidget::ClearTables()
{
RDSqlQuery *q1;
QString sql="show tables";
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString().sprintf("drop table %s",
(const char *)q->value(0).toString());
q1=new RDSqlQuery(sql);
delete q1;
rda->dropTable(q->value(0).toString());
}
delete q;
}

5
rdadmin/test_import.cpp
View File

@ -245,10 +245,7 @@ void TestImport::importData()
}
delete q;
// printf("IMPORT TABLE: %s_TEST_IMP\n",(const char *)test_svc->name());
sql=QString().sprintf("drop table `%s_TEST_IMP`",
(const char *)test_svc->name());
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(test_svc->name()+"_TEST_IMP");
}

4
rdlogmanager/edit_clock.cpp
View File

@ -771,9 +771,7 @@ void EditClock::AbandonClock(QString name)
RDSqlQuery *q=new RDSqlQuery(sql);
delete q;
sql=QString("drop table `")+RDClock::tableName(name)+"`";
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(RDClock::tableName(name));
}

9
rdlogmanager/edit_event.cpp
View File

@ -1654,10 +1654,7 @@ void EditEvent::AbandonEvent(QString name)
(const char *)RDEscapeString(name));
q=new RDSqlQuery(sql);
delete q;
sql=QString("drop table `")+RDEvent::preimportTableName(name)+"`";
q=new RDSqlQuery(sql);
delete q;
sql=QString("drop table `")+RDEvent::postimportTableName(name)+"`";
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(RDEvent::preimportTableName(name));
rda->dropTable(RDEvent::postimportTableName(name));
}

12
rdlogmanager/list_clocks.cpp
View File

@ -251,9 +251,7 @@ void ListClocks::addData()
clockname_esc=clockname;
clockname_esc.replace(" ","_");
clockname_esc+="_CLK";
sql=QString().sprintf("drop table %s",(const char *)clockname_esc);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(clockname_esc);
sql=QString().sprintf("delete from CLOCKS where NAME=\"%s\"",
(const char *)clockname);
q=new RDSqlQuery(sql);
@ -633,12 +631,8 @@ void ListClocks::DeleteClock(QString clockname)
(const char *)clockname);
q=new RDSqlQuery(sql);
delete q;
sql=QString().sprintf("drop table %s_CLK",(const char *)base_name);
q=new RDSqlQuery(sql);
delete q;
sql=QString().sprintf("drop table %s_RULES",(const char *)base_name);
q=new RDSqlQuery(sql);
delete q;
rda->dropTable(base_name+"_CLK");
rda->dropTable(base_name+"_RULES");
}

17
rdlogmanager/list_events.cpp
View File

@ -32,11 +32,11 @@
#include <rddb.h>
#include <rdevent.h>
#include <list_events.h>
#include <add_event.h>
#include <edit_event.h>
#include <globals.h>
#include <rename_item.h>
#include "add_event.h"
#include "edit_event.h"
#include "globals.h"
#include "list_events.h"
#include "rename_item.h"
ListEvents::ListEvents(QString *eventname,QWidget *parent)
: QDialog(parent,"",true)
@ -598,11 +598,8 @@ void ListEvents::DeleteEvent(QString event_name)
(const char *)event_name);
q=new RDSqlQuery(sql);
delete q;
sql=QString().sprintf("drop table %s_PRE",(const char *)base_name);
q=new RDSqlQuery(sql);
delete q;
sql=QString().sprintf("drop table %s_POST",(const char *)base_name);
q=new RDSqlQuery(sql);
rda->dropTable(base_name+"_PRE");
rda->dropTable(base_name+"_POST");
}