Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Added an 'Engine=' directive to the [MySQL] section of
	rd.conf(5).
	* Refactored the schema update code to use standard form
	in rdadmin(1).
This commit is contained in:
Fred Gleason
2017-12-01 17:37:37 -05:00
parent cbba0eb10a
commit a8ae9f9bfa
54 changed files with 4210 additions and 4680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/rdclilogedit/operations.cpp
View File

@@ -368,7 +368,7 @@ void MainObject::Save()
Saveas(edit_log->name());
}
else {
edit_log_event->save();
edit_log_event->save(edit_config);
edit_log->setDescription(edit_description);
edit_log->setStartDate(edit_start_date);
edit_log->setEndDate(edit_end_date);
@@ -404,9 +404,9 @@ void MainObject::Saveas(const QString &logname)
"SERVICE=\""+RDEscapeString(edit_service)+"\"";
q=new RDSqlQuery(sql);
delete q;
RDCreateLogTable(RDLog::tableName(logname));
RDCreateLogTable(RDLog::tableName(logname),edit_config);
edit_log_event->setLogName(RDLog::tableName(logname));
edit_log_event->save();
edit_log_event->save(edit_config);
delete edit_log;
edit_log=log;
edit_modified=false;

9
utils/rddbcheck/rddbcheck.cpp
View File

@@ -2,7 +2,7 @@
//
// A Database Check/Repair Tool for Rivendell.
//
// (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2006,2016-2017 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
@@ -357,7 +357,8 @@ void MainObject::CheckClocks()
(const char *)q->value(0).toString());
fflush(NULL);
if(UserResponse()) {
sql=RDCreateClockTableSql(RDClock::tableName(q->value(0).toString()));
sql=RDCreateClockTableSql(RDClock::tableName(q->value(0).toString()),
rdconfig);
q2=new QSqlQuery(sql);
delete q2;
}
@@ -392,7 +393,7 @@ void MainObject::CheckEvents()
(const char *)q->value(0).toString());
fflush(NULL);
if(UserResponse()) {
sql=RDCreateLogTableSql(eventname+"_PRE");
sql=RDCreateLogTableSql(eventname+"_PRE",rdconfig);
q2=new QSqlQuery(sql);
delete q2;
}
@@ -409,7 +410,7 @@ void MainObject::CheckEvents()
(const char *)q->value(0).toString());
fflush(NULL);
if(UserResponse()) {
sql=RDCreateLogTableSql(eventname+"_POST");
sql=RDCreateLogTableSql(eventname+"_POST",rdconfig);
q2=new QSqlQuery(sql);
delete q2;
}

9
utils/rdrevert/rdrevert.cpp
View File

@@ -342,7 +342,8 @@ void MainObject::Revert251() const
sql=QString("select NAME from CLOCKS");
q=new QSqlQuery(sql);
while(q->next()) {
sql=RDCreateClockTableSql(RDClock::tableName(q->value(0).toString()));
sql=RDCreateClockTableSql(RDClock::tableName(q->value(0).toString()),
rev_config);
q1=new QSqlQuery(sql);
delete q1;
sql=QString("select EVENT_NAME,START_TIME,LENGTH from CLOCK_METADATA ")+
@@ -377,7 +378,8 @@ void MainObject::Revert252() const
sql=QString("select NAME from EVENTS");
q=new QSqlQuery(sql);
while(q->next()) {
RDCreateLogTable(RDEvent::preimportTableName(q->value(0).toString()));
RDCreateLogTable(RDEvent::preimportTableName(q->value(0).toString()),
rev_config);
sql=QString("select COUNT,TYPE,TRANS_TYPE,CART_NUMBER,TEXT ")+
"from EVENT_METADATA where "+
"(EVENT_NAME=\""+RDEscapeString(q->value(0).toString())+"\")&&"+
@@ -396,7 +398,8 @@ void MainObject::Revert252() const
}
delete q1;
RDCreateLogTable(RDEvent::postimportTableName(q->value(0).toString()));
RDCreateLogTable(RDEvent::postimportTableName(q->value(0).toString()),
rev_config);
sql=QString("select COUNT,TYPE,TRANS_TYPE,CART_NUMBER,TEXT ")+
"from EVENT_METADATA where "+
"(EVENT_NAME=\""+RDEscapeString(q->value(0).toString())+"\")&&"+