Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-09 22:43:11 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Added a 'RULE_LINES' table to the database.
	* Incremented the database version to 292.
This commit is contained in:
Fred Gleason 2018-07-10 08:30:06 -04:00
parent 1008b69076
commit 08c01373cb
10 changed files with 194 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17109,3 +17109,6 @@
2018-07-09 Fred Gleason <fredg@paravelsystems.com>
* Added code in rddbmgr(8) to update the registered schema number
in the DB after each schema modification.
2018-07-09 Fred Gleason <fredg@paravelsystems.com>
* Added a 'RULE_LINES' table to the database.
* Incremented the database version to 292.

1
docs/tables/Makefile.am
View File

@ -71,6 +71,7 @@ EXTRA_DIST = audio_cards.txt\
replicator_map.txt\
replicators.txt\
reports.txt\
rule_lines.txt\
service_clocks.txt\
services.txt\
sources.txt\

14
docs/tables/rule_lines.txt Normal file
View File

@ -0,0 +1,14 @@
Rules Lines Table Layout for Rivendell
The RULE_LINES table holds the music scheduler rules for each clock.
FIELD NAME TYPE REMARKS
------------------------------------------------------------------------
ID int(11) signed Primary key, auto-increment
CLOCK_NAME char(64) From CLOCKS.NAME
CODE varchar(10) from SCHED_CODES.CODE
MAX_ROW int(10) unsigned
MIN_WAIT int(10) unsigned
NOT_AFTER varchar(10)
OR_AFTER varchar(10)
OR_AFTER_II varchar(10)

2
lib/dbversion.h
View File

@ -24,7 +24,7 @@
/*
* Current Database Version
*/
#define RD_VERSION_DATABASE 291
#define RD_VERSION_DATABASE 292
#endif // DBVERSION_H

10
lib/rdevent_line.cpp
View File

@ -704,7 +704,15 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname,
schedCL->restore();
// Scheduler Codes
sql=QString().sprintf("select CODE,MAX_ROW,MIN_WAIT,NOT_AFTER, OR_AFTER,OR_AFTER_II from %s_RULES",(const char *)clockname);
sql=QString("select ")+
"CODE,"+ // 00
"MAX_ROW,"+ // 01
"MIN_WAIT,"+ // 02
"NOT_AFTER,"+ // 03
"OR_AFTER,"+ // 04
"OR_AFTER_II "+ // 05
"from RULE_LINES where "+
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
q=new RDSqlQuery(sql);
while (q->next()) {
// max in a row, min wait

66
lib/schedruleslist.cpp
View File

@ -18,30 +18,18 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qmessagebox.h>
#include <rdclock.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <schedruleslist.h>
#include <qmessagebox.h>
SchedRulesList::SchedRulesList(QString clockname,RDConfig *config)
{
QString sql;
RDSqlQuery *q;
RDSqlQuery *q1;
QString clkname=clockname;
clkname.replace(" ","_");
sql=QString("create table if not exists `")+
clkname+"_RULES` ("+
"CODE varchar(10) not null primary key,"+
"MAX_ROW int unsigned,"+
"MIN_WAIT int unsigned,"+
"NOT_AFTER varchar(10),"+
"OR_AFTER varchar(10),"+
"OR_AFTER_II varchar(10)) "+
config->createTablePostfix();
q=new RDSqlQuery(sql);
delete q;
sql=QString().sprintf("select CODE,DESCRIPTION from SCHED_CODES order by `CODE` asc");
@ -60,27 +48,32 @@ SchedRulesList::SchedRulesList(QString clockname,RDConfig *config)
q->next();
sched_code[i] = q->value(0).toString();
description[i] = q->value(1).toString();
sql=QString().sprintf("select MAX_ROW,MIN_WAIT,NOT_AFTER,OR_AFTER,OR_AFTER_II from %s_RULES where CODE=\"%s\"",
(const char *)clockname.replace(" ","_"),(const char *)sched_code[i]);
sql=QString("select ")+
"MAX_ROW,"+ // 00
"MIN_WAIT,"+ // 01
"NOT_AFTER,"+ // 02
"OR_AFTER,"+ // 03
"OR_AFTER_II "+ // 04
"from RULE_LINES where "+
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\" && "+
"CODE=\""+RDEscapeString(sched_code[i])+"\"";
q1=new RDSqlQuery(sql);
if(q1->first())
{
if(q1->first()) {
max_row[i] = q1->value(0).toInt();
min_wait[i] = q1->value(1).toInt();
not_after[i] = q1->value(2).toString();
or_after[i] = q1->value(3).toString();
or_after_II[i] = q1->value(3).toString();
}
else
{
}
else {
max_row[i] = 1;
min_wait[i] = 0;
not_after[i] = "";
or_after[i] = "";
or_after_II[i] = "";
}
delete q1;
}
delete q1;
}
delete q;
}
@ -147,18 +140,21 @@ int SchedRulesList::getNumberOfItems(void)
void SchedRulesList::Save(QString clockname)
{
QString sql;
RDSqlQuery *q;
sql=QString().sprintf("delete from %s_RULES",
(const char *)clockname.replace(" ","_"));
q=new RDSqlQuery(sql);
delete q;
for (int i=0;i<itemcounter;i++)
{
sql=QString().sprintf("insert into %s_RULES set CODE=\"%s\",MAX_ROW=%d,MIN_WAIT=%d,NOT_AFTER=\"%s\",OR_AFTER=\"%s\",OR_AFTER_II=\"%s\"",(const char *)clockname.replace(" ","_"),(const char *)sched_code[i],max_row[i],min_wait[i],(const char *)not_after[i],(const char *)or_after[i],(const char *)or_after_II[i]);
q=new RDSqlQuery(sql);
delete q;
}
sql=QString("delete from RULE_LINES where ")+
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
RDSqlQuery::apply(sql);
for (int i=0;i<itemcounter;i++) {
sql=QString("insert into RULE_LINES set ")+
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\","+
"CODE=\""+RDEscapeString(sched_code[i])+"\","+
QString().sprintf("MAX_ROW=%d,",max_row[i])+
QString().sprintf("MIN_WAIT=%d,",min_wait[i])+
"NOT_AFTER=\""+RDEscapeString(not_after[i])+"\","+
"OR_AFTER=\""+RDEscapeString(or_after[i])+"\","+
"OR_AFTER_II=\""+RDEscapeString(or_after_II[i])+"\"";
RDSqlQuery::apply(sql);
}
}

19
rdlogmanager/list_clocks.cpp
View File

@ -383,15 +383,11 @@ void ListClocks::renameData()
"CLOCK_NAME=\""+RDEscapeString(item->text(0))+"\"";
q=new RDSqlQuery(sql);
delete q;
QString old_name_esc=item->text(0);
old_name_esc.replace(" ","_");
QString new_name_esc=new_name;
new_name_esc.replace(" ","_");
sql=QString().sprintf("alter table %s_RULES rename to %s_RULES",
(const char *)old_name_esc,
(const char *)new_name_esc);
q=new RDSqlQuery(sql);
delete q;
sql=QString("update RULE_LINES set ")+
"CLOCK_NAME=\""+RDEscapeString(new_name)+"\" where "+
"CLOCK_NAME=\""+RDEscapeString(item->text(0))+"\"";
RDSqlQuery::apply(sql);
//
// Rename Service Permissions
@ -628,7 +624,10 @@ void ListClocks::DeleteClock(QString clockname)
sql=QString("delete from CLOCK_LINES where ")+
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
RDSqlQuery::apply(sql);
rda->dropTable(base_name+"_RULES");
sql=QString("delete from RULE_LINES where ")+
"CLOCK_NAME=\""+RDEscapeString(clockname)+"\"";
RDSqlQuery::apply(sql);
}

55
utils/rddbmgr/revertschema.cpp
View File

@ -38,6 +38,61 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) co
//
//
// Revert 292
//
if((cur_schema==292)&&(set_schema<cur_schema)) {
sql=QString("select NAME from CLOCKS");
q=new RDSqlQuery(sql);
while(q->next()) {
QString tablename=q->value(0).toString()+"_RULES";
tablename.replace(" ","_");
sql=QString("create table `")+tablename+"` ("+
"CODE varchar(10) not null primary key,"+
"MAX_ROW int unsigned,"+
"MIN_WAIT int unsigned,"+
"NOT_AFTER varchar(10),"+
"OR_AFTER varchar(10),"+
"OR_AFTER_II varchar(10))"+
db_table_create_postfix;
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString("select ")+
"CODE,"+ // 00
"MAX_ROW,"+ // 01
"MIN_WAIT,"+ // 02
"NOT_AFTER,"+ // 03
"OR_AFTER,"+ // 04
"OR_AFTER_II "+ // 05
"from RULE_LINES where "+
"CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\" "+
"order by CODE";
q1=new RDSqlQuery(sql,false);
while(q1->next()) {
sql=QString("insert into `")+tablename+"` set "+
"CODE=\""+RDEscapeString(q1->value(0).toString())+"\","+
QString().sprintf("MAX_ROW=%u,",q1->value(1).toUInt())+
QString().sprintf("MIN_WAIT=%u,",q1->value(2).toUInt())+
"NOT_AFTER=\""+RDEscapeString(q1->value(3).toString())+"\","+
"OR_AFTER=\""+RDEscapeString(q1->value(4).toString())+"\","+
"OR_AFTER_II=\""+RDEscapeString(q1->value(5).toString())+"\"";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
}
delete q1;
}
if(!DropTable("RULE_LINES",err_msg)) {
return false;
}
WriteSchemaVersion(--cur_schema);
}
//
// Revert 291
//

2
utils/rddbmgr/schemamap.cpp
View File

@ -132,7 +132,7 @@ void MainObject::InitializeSchemaMap() {
global_version_map["2.17"]=268;
global_version_map["2.18"]=272;
global_version_map["2.19"]=275;
global_version_map["2.20"]=291;
global_version_map["2.20"]=292;
}

74
utils/rddbmgr/updateschema.cpp
View File

@ -7328,7 +7328,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) co
q=new RDSqlQuery(sql);
while(q->next()) {
if(DropTable(q->value(0).toString(),err_msg)) {
fprintf(stderr,"rddbmgr: dropping orphaned log table \"%s\"\n",
fprintf(stderr,"rddbmgr: dropping orphaned LOG table \"%s\"\n",
(const char *)q->value(0).toString());
}
}
@ -7581,7 +7581,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) co
q=new RDSqlQuery(sql);
while(q->next()) {
if(DropTable(q->value(0).toString(),err_msg)) {
fprintf(stderr,"rddbmgr: dropping orphaned preimport event table \"%s\"\n",
fprintf(stderr,"rddbmgr: dropping orphaned PRE table \"%s\"\n",
(const char *)q->value(0).toString());
}
}
@ -7592,7 +7592,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) co
q=new RDSqlQuery(sql);
while(q->next()) {
if(DropTable(q->value(0).toString(),err_msg)) {
fprintf(stderr,"rddbmgr: dropping orphaned postimport event table \"%s\"\n",
fprintf(stderr,"rddbmgr: dropping orphaned POST table \"%s\"\n",
(const char *)q->value(0).toString());
}
}
@ -7648,7 +7648,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) co
q=new RDSqlQuery(sql);
while(q->next()) {
if(DropTable(q->value(0).toString(),err_msg)) {
fprintf(stderr,"rddbmgr: dropping orphaned clock table \"%s\"\n",
fprintf(stderr,"rddbmgr: dropping orphaned CLK table \"%s\"\n",
(const char *)q->value(0).toString());
}
}
@ -7657,6 +7657,72 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) co
WriteSchemaVersion(++cur_schema);
}
if((cur_schema<292)&&(set_schema>cur_schema)) {
sql=QString("create table if not exists RULE_LINES (")+
"ID int unsigned auto_increment primary key,"+
"CLOCK_NAME char(64) not null,"+
"CODE varchar(10) not null,"+
"MAX_ROW int unsigned,"+
"MIN_WAIT int unsigned,"+
"NOT_AFTER varchar(10),"+
"OR_AFTER varchar(10),"+
"OR_AFTER_II varchar(10),"+
"unique index CLOCK_NAME_CODE_IDX(CLOCK_NAME,CODE))"+
db_table_create_postfix;
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString("select NAME from CLOCKS");
q=new RDSqlQuery(sql);
while(q->next()) {
QString tablename=q->value(0).toString()+"_RULES";
tablename.replace(" ","_");
sql=QString("select ")+
"CODE,"+ // 00
"MAX_ROW,"+ // 01
"MIN_WAIT,"+ // 02
"NOT_AFTER,"+ // 03
"OR_AFTER,"+ // 04
"OR_AFTER_II "+ // 05
"from `"+tablename+"` "+
"order by CODE";
q1=new RDSqlQuery(sql);
while(q1->next()) {
sql=QString("insert into RULE_LINES set ")+
"CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+
"CODE=\""+RDEscapeString(q1->value(0).toString())+"\","+
QString().sprintf("MAX_ROW=%u,",q1->value(1).toUInt())+
QString().sprintf("MIN_WAIT=%u,",q1->value(2).toUInt())+
"NOT_AFTER=\""+RDEscapeString(q1->value(3).toString())+"\","+
"OR_AFTER=\""+RDEscapeString(q1->value(4).toString())+"\","+
"OR_AFTER_II=\""+RDEscapeString(q1->value(5).toString())+"\"";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
}
delete q1;
if(!DropTable(tablename,err_msg)) {
return false;
}
}
delete q;
sql=QString("show tables where ")+
"Tables_in_"+db_config->mysqlDbname()+" like \"%_RULES\"";
q=new RDSqlQuery(sql);
while(q->next()) {
if(DropTable(q->value(0).toString(),err_msg)) {
fprintf(stderr,"rddbmgr: dropping orphaned RULES table \"%s\"\n",
(const char *)q->value(0).toString());
}
}
delete q;
WriteSchemaVersion(++cur_schema);
}
//