mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-06-06 15:12:42 +02:00
2018-04-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that caused the 'SERVICES.TRACK_GROUP', 'SERVICES./AUTOSPOT_GROUP', 'SERVICES.DEFAULT_LOG_SHELFLIFE', 'SERVICES.LOG_SHELFLIFE_ORIGIN', 'SERVICES.TFC_IMPORT_TEMPLATE' and 'SERVICE.MUS_IMPORT_TEMPLATE field values to fail to be cloned from the exemplar when creating a new Service.
This commit is contained in:
Fred Gleason
parent
b4e9e4b6b6
commit
7e437154ad
@ -16785,3 +16785,9 @@
|
|||||||
the core library.
|
the core library.
|
||||||
2018-04-30 Fred Gleason <fredg@paravelsystems.com>
|
2018-04-30 Fred Gleason <fredg@paravelsystems.com>
|
||||||
* Added a script in 'scripts/init_template_host.py'.
|
* Added a script in 'scripts/init_template_host.py'.
|
||||||
|
2018-04-30 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Fixed a bug that caused the 'SERVICES.TRACK_GROUP',
|
||||||
|
'SERVICES./AUTOSPOT_GROUP', 'SERVICES.DEFAULT_LOG_SHELFLIFE',
|
||||||
|
'SERVICES.LOG_SHELFLIFE_ORIGIN', 'SERVICES.TFC_IMPORT_TEMPLATE' and
|
||||||
|
'SERVICE.MUS_IMPORT_TEMPLATE field values to fail to be cloned from
|
||||||
|
the exemplar when creating a new Service.
|
||||||
|
|||||||
181
lib/rdsvc.cpp
181
lib/rdsvc.cpp
@ -1144,48 +1144,54 @@ bool RDSvc::create(const QString &name,QString *err_msg,
|
|||||||
"NAME_TEMPLATE,"+ // 00
|
"NAME_TEMPLATE,"+ // 00
|
||||||
"DESCRIPTION_TEMPLATE,"+ // 01
|
"DESCRIPTION_TEMPLATE,"+ // 01
|
||||||
"CHAIN_LOG,"+ // 02
|
"CHAIN_LOG,"+ // 02
|
||||||
"AUTO_REFRESH,"+ // 03
|
"TRACK_GROUP,"+ // 03
|
||||||
"ELR_SHELFLIFE,"+ // 04
|
"AUTOSPOT_GROUP,"+ // 04
|
||||||
"TFC_PATH,"+ // 05
|
"DEFAULT_LOG_SHELFLIFE,"+ // 05
|
||||||
"TFC_WIN_PATH,"+ // 06
|
"LOG_SHELFLIFE_ORIGIN,"+ // 06
|
||||||
"TFC_CART_OFFSET,"+ // 07
|
"AUTO_REFRESH,"+ // 07
|
||||||
"TFC_CART_LENGTH,"+ // 08
|
"ELR_SHELFLIFE,"+ // 08
|
||||||
"TFC_START_OFFSET,"+ // 09
|
"TFC_IMPORT_TEMPLATE,"+ // 09
|
||||||
"TFC_START_LENGTH,"+ // 10
|
"TFC_PATH,"+ // 10
|
||||||
"TFC_LENGTH_OFFSET,"+ // 11
|
"TFC_WIN_PATH,"+ // 11
|
||||||
"TFC_LENGTH_LENGTH,"+ // 12
|
"TFC_CART_OFFSET,"+ // 12
|
||||||
"TFC_HOURS_OFFSET,"+ // 13
|
"TFC_CART_LENGTH,"+ // 13
|
||||||
"TFC_HOURS_LENGTH,"+ // 14
|
"TFC_START_OFFSET,"+ // 14
|
||||||
"TFC_MINUTES_OFFSET,"+ // 15
|
"TFC_START_LENGTH,"+ // 15
|
||||||
"TFC_MINUTES_LENGTH,"+ // 16
|
"TFC_LENGTH_OFFSET,"+ // 16
|
||||||
"TFC_SECONDS_OFFSET,"+ // 17
|
"TFC_LENGTH_LENGTH,"+ // 17
|
||||||
"TFC_SECONDS_LENGTH,"+ // 18
|
"TFC_HOURS_OFFSET,"+ // 18
|
||||||
"TFC_DATA_OFFSET,"+ // 19
|
"TFC_HOURS_LENGTH,"+ // 19
|
||||||
"TFC_DATA_LENGTH,"+ // 20
|
"TFC_MINUTES_OFFSET,"+ // 20
|
||||||
"TFC_EVENT_ID_OFFSET,"+ // 21
|
"TFC_MINUTES_LENGTH,"+ // 21
|
||||||
"TFC_EVENT_ID_LENGTH,"+ // 22
|
"TFC_SECONDS_OFFSET,"+ // 22
|
||||||
"TFC_ANNC_TYPE_OFFSET,"+ // 23
|
"TFC_SECONDS_LENGTH,"+ // 23
|
||||||
"TFC_ANNC_TYPE_LENGTH,"+ // 24
|
"TFC_DATA_OFFSET,"+ // 24
|
||||||
"MUS_PATH,"+ // 25
|
"TFC_DATA_LENGTH,"+ // 25
|
||||||
"MUS_WIN_PATH,"+ // 26
|
"TFC_EVENT_ID_OFFSET,"+ // 26
|
||||||
"MUS_CART_OFFSET,"+ // 27
|
"TFC_EVENT_ID_LENGTH,"+ // 27
|
||||||
"MUS_CART_LENGTH,"+ // 28
|
"TFC_ANNC_TYPE_OFFSET,"+ // 28
|
||||||
"MUS_START_OFFSET,"+ // 29
|
"TFC_ANNC_TYPE_LENGTH,"+ // 29
|
||||||
"MUS_START_LENGTH,"+ // 30
|
"MUS_IMPORT_TEMPLATE,"+ // 30
|
||||||
"MUS_LENGTH_OFFSET,"+ // 31
|
"MUS_PATH,"+ // 31
|
||||||
"MUS_LENGTH_LENGTH,"+ // 32
|
"MUS_WIN_PATH,"+ // 32
|
||||||
"MUS_HOURS_OFFSET,"+ // 33
|
"MUS_CART_OFFSET,"+ // 33
|
||||||
"MUS_HOURS_LENGTH,"+ // 34
|
"MUS_CART_LENGTH,"+ // 34
|
||||||
"MUS_MINUTES_OFFSET,"+ // 35
|
"MUS_START_OFFSET,"+ // 35
|
||||||
"MUS_MINUTES_LENGTH,"+ // 36
|
"MUS_START_LENGTH,"+ // 36
|
||||||
"MUS_SECONDS_OFFSET,"+ // 37
|
"MUS_LENGTH_OFFSET,"+ // 37
|
||||||
"MUS_SECONDS_LENGTH,"+ // 38
|
"MUS_LENGTH_LENGTH,"+ // 38
|
||||||
"MUS_DATA_OFFSET,"+ // 39
|
"MUS_HOURS_OFFSET,"+ // 39
|
||||||
"MUS_DATA_LENGTH,"+ // 40
|
"MUS_HOURS_LENGTH,"+ // 40
|
||||||
"MUS_EVENT_ID_OFFSET,"+ // 41
|
"MUS_MINUTES_OFFSET,"+ // 41
|
||||||
"MUS_EVENT_ID_LENGTH,"+ // 42
|
"MUS_MINUTES_LENGTH,"+ // 42
|
||||||
"MUS_ANNC_TYPE_OFFSET,"+ // 43
|
"MUS_SECONDS_OFFSET,"+ // 43
|
||||||
"MUS_ANNC_TYPE_LENGTH "+ // 44
|
"MUS_SECONDS_LENGTH,"+ // 44
|
||||||
|
"MUS_DATA_OFFSET,"+ // 45
|
||||||
|
"MUS_DATA_LENGTH,"+ // 46
|
||||||
|
"MUS_EVENT_ID_OFFSET,"+ // 47
|
||||||
|
"MUS_EVENT_ID_LENGTH,"+ // 48
|
||||||
|
"MUS_ANNC_TYPE_OFFSET,"+ // 49
|
||||||
|
"MUS_ANNC_TYPE_LENGTH "+ // 50
|
||||||
" from SERVICES where NAME=\""+RDEscapeString(exemplar)+"\"";
|
" from SERVICES where NAME=\""+RDEscapeString(exemplar)+"\"";
|
||||||
q=new RDSqlQuery(sql);
|
q=new RDSqlQuery(sql);
|
||||||
if(q->first()) {
|
if(q->first()) {
|
||||||
@ -1193,49 +1199,56 @@ bool RDSvc::create(const QString &name,QString *err_msg,
|
|||||||
"NAME_TEMPLATE=\""+RDEscapeString(q->value(0).toString())+"\","+
|
"NAME_TEMPLATE=\""+RDEscapeString(q->value(0).toString())+"\","+
|
||||||
"DESCRIPTION_TEMPLATE=\""+RDEscapeString(q->value(1).toString())+"\","+
|
"DESCRIPTION_TEMPLATE=\""+RDEscapeString(q->value(1).toString())+"\","+
|
||||||
"CHAIN_LOG=\""+RDEscapeString(q->value(2).toString())+"\","+
|
"CHAIN_LOG=\""+RDEscapeString(q->value(2).toString())+"\","+
|
||||||
"AUTO_REFRESH=\""+RDEscapeString(q->value(3).toString())+"\","+
|
"TRACK_GROUP=\""+RDEscapeString(q->value(3).toString())+"\","+
|
||||||
QString().sprintf("ELR_SHELFLIFE=%d,",q->value(4).toInt())+
|
"AUTOSPOT_GROUP=\""+RDEscapeString(q->value(4).toString())+"\","+
|
||||||
"TFC_PATH=\""+RDEscapeString(q->value(5).toString())+"\","+
|
QString().sprintf("DEFAULT_LOG_SHELFLIFE=%d,",q->value(5).toInt())+
|
||||||
"TFC_WIN_PATH=\""+RDEscapeString(q->value(6).toString())+"\","+
|
QString().sprintf("LOG_SHELFLIFE_ORIGIN=%d,",q->value(6).toInt())+
|
||||||
QString().sprintf("TFC_CART_OFFSET=%d,",q->value(7).toInt())+
|
"AUTO_REFRESH=\""+RDEscapeString(q->value(7).toString())+"\","+
|
||||||
QString().sprintf("TFC_CART_LENGTH=%d,",q->value(8).toInt())+
|
QString().sprintf("ELR_SHELFLIFE=%d,",q->value(8).toInt())+
|
||||||
QString().sprintf("TFC_START_OFFSET=%d,",q->value(9).toInt())+
|
"TFC_IMPORT_TEMPLATE=\""+RDEscapeString(q->value(9).toString())+"\","+
|
||||||
QString().sprintf("TFC_START_LENGTH=%d,",q->value(10).toInt())+
|
"TFC_PATH=\""+RDEscapeString(q->value(10).toString())+"\","+
|
||||||
QString().sprintf("TFC_LENGTH_OFFSET=%d,",q->value(11).toInt())+
|
"TFC_WIN_PATH=\""+RDEscapeString(q->value(11).toString())+"\","+
|
||||||
QString().sprintf("TFC_LENGTH_LENGTH=%d,",q->value(12).toInt())+
|
QString().sprintf("TFC_CART_OFFSET=%d,",q->value(12).toInt())+
|
||||||
QString().sprintf("TFC_HOURS_OFFSET=%d,",q->value(13).toInt())+
|
QString().sprintf("TFC_CART_LENGTH=%d,",q->value(13).toInt())+
|
||||||
QString().sprintf("TFC_HOURS_LENGTH=%d,",q->value(14).toInt())+
|
QString().sprintf("TFC_START_OFFSET=%d,",q->value(14).toInt())+
|
||||||
QString().sprintf("TFC_MINUTES_OFFSET=%d,",q->value(15).toInt())+
|
QString().sprintf("TFC_START_LENGTH=%d,",q->value(15).toInt())+
|
||||||
QString().sprintf("TFC_MINUTES_LENGTH=%d,",q->value(16).toInt())+
|
QString().sprintf("TFC_LENGTH_OFFSET=%d,",q->value(16).toInt())+
|
||||||
QString().sprintf("TFC_SECONDS_OFFSET=%d,",q->value(17).toInt())+
|
QString().sprintf("TFC_LENGTH_LENGTH=%d,",q->value(17).toInt())+
|
||||||
QString().sprintf("TFC_SECONDS_LENGTH=%d,",q->value(18).toInt())+
|
QString().sprintf("TFC_HOURS_OFFSET=%d,",q->value(18).toInt())+
|
||||||
QString().sprintf("TFC_DATA_OFFSET=%d,",q->value(19).toInt())+
|
QString().sprintf("TFC_HOURS_LENGTH=%d,",q->value(19).toInt())+
|
||||||
QString().sprintf("TFC_DATA_LENGTH=%d,",q->value(20).toInt())+
|
QString().sprintf("TFC_MINUTES_OFFSET=%d,",q->value(20).toInt())+
|
||||||
QString().sprintf("TFC_EVENT_ID_OFFSET=%d,",q->value(21).toInt())+
|
QString().sprintf("TFC_MINUTES_LENGTH=%d,",q->value(21).toInt())+
|
||||||
QString().sprintf("TFC_EVENT_ID_LENGTH=%d,",q->value(22).toInt())+
|
QString().sprintf("TFC_SECONDS_OFFSET=%d,",q->value(22).toInt())+
|
||||||
QString().sprintf("TFC_ANNC_TYPE_OFFSET=%d,",q->value(23).toInt())+
|
QString().sprintf("TFC_SECONDS_LENGTH=%d,",q->value(23).toInt())+
|
||||||
QString().sprintf("TFC_ANNC_TYPE_LENGTH=%d,",q->value(24).toInt())+
|
QString().sprintf("TFC_DATA_OFFSET=%d,",q->value(24).toInt())+
|
||||||
"MUS_PATH=\""+RDEscapeString(q->value(25).toString())+"\","+
|
QString().sprintf("TFC_DATA_LENGTH=%d,",q->value(25).toInt())+
|
||||||
"MUS_WIN_PATH=\""+RDEscapeString(q->value(26).toString())+"\","+
|
QString().sprintf("TFC_EVENT_ID_OFFSET=%d,",q->value(26).toInt())+
|
||||||
QString().sprintf("MUS_CART_OFFSET=%d,",q->value(27).toInt())+
|
QString().sprintf("TFC_EVENT_ID_LENGTH=%d,",q->value(27).toInt())+
|
||||||
QString().sprintf("MUS_CART_LENGTH=%d,",q->value(28).toInt())+
|
QString().sprintf("TFC_ANNC_TYPE_OFFSET=%d,",q->value(28).toInt())+
|
||||||
QString().sprintf("MUS_START_OFFSET=%d,",q->value(29).toInt())+
|
QString().sprintf("TFC_ANNC_TYPE_LENGTH=%d,",q->value(29).toInt())+
|
||||||
QString().sprintf("MUS_START_LENGTH=%d,",q->value(30).toInt())+
|
"MUS_IMPORT_TEMPLATE=\""+RDEscapeString(q->value(30).toString())+"\","+
|
||||||
QString().sprintf("MUS_LENGTH_OFFSET=%d,",q->value(31).toInt())+
|
"MUS_PATH=\""+RDEscapeString(q->value(31).toString())+"\","+
|
||||||
QString().sprintf("MUS_LENGTH_LENGTH=%d,",q->value(32).toInt())+
|
"MUS_WIN_PATH=\""+RDEscapeString(q->value(32).toString())+"\","+
|
||||||
QString().sprintf("MUS_HOURS_OFFSET=%d,",q->value(33).toInt())+
|
QString().sprintf("MUS_CART_OFFSET=%d,",q->value(33).toInt())+
|
||||||
QString().sprintf("MUS_HOURS_LENGTH=%d,",q->value(34).toInt())+
|
QString().sprintf("MUS_CART_LENGTH=%d,",q->value(34).toInt())+
|
||||||
QString().sprintf("MUS_MINUTES_OFFSET=%d,",q->value(35).toInt())+
|
QString().sprintf("MUS_START_OFFSET=%d,",q->value(35).toInt())+
|
||||||
QString().sprintf("MUS_MINUTES_LENGTH=%d,",q->value(36).toInt())+
|
QString().sprintf("MUS_START_LENGTH=%d,",q->value(36).toInt())+
|
||||||
QString().sprintf("MUS_SECONDS_OFFSET=%d,",q->value(37).toInt())+
|
QString().sprintf("MUS_LENGTH_OFFSET=%d,",q->value(37).toInt())+
|
||||||
QString().sprintf("MUS_SECONDS_LENGTH=%d,",q->value(38).toInt())+
|
QString().sprintf("MUS_LENGTH_LENGTH=%d,",q->value(38).toInt())+
|
||||||
QString().sprintf("MUS_DATA_OFFSET=%d,",q->value(39).toInt())+
|
QString().sprintf("MUS_HOURS_OFFSET=%d,",q->value(39).toInt())+
|
||||||
QString().sprintf("MUS_DATA_LENGTH=%d,",q->value(40).toInt())+
|
QString().sprintf("MUS_HOURS_LENGTH=%d,",q->value(40).toInt())+
|
||||||
QString().sprintf("MUS_EVENT_ID_OFFSET=%d,",q->value(41).toInt())+
|
QString().sprintf("MUS_MINUTES_OFFSET=%d,",q->value(41).toInt())+
|
||||||
QString().sprintf("MUS_EVENT_ID_LENGTH=%d,",q->value(42).toInt())+
|
QString().sprintf("MUS_MINUTES_LENGTH=%d,",q->value(42).toInt())+
|
||||||
QString().sprintf("MUS_ANNC_TYPE_OFFSET=%d,",q->value(43).toInt())+
|
QString().sprintf("MUS_SECONDS_OFFSET=%d,",q->value(43).toInt())+
|
||||||
QString().sprintf("MUS_ANNC_TYPE_LENGTH=%d,",q->value(44).toInt())+
|
QString().sprintf("MUS_SECONDS_LENGTH=%d,",q->value(44).toInt())+
|
||||||
|
QString().sprintf("MUS_DATA_OFFSET=%d,",q->value(45).toInt())+
|
||||||
|
QString().sprintf("MUS_DATA_LENGTH=%d,",q->value(46).toInt())+
|
||||||
|
QString().sprintf("MUS_EVENT_ID_OFFSET=%d,",q->value(47).toInt())+
|
||||||
|
QString().sprintf("MUS_EVENT_ID_LENGTH=%d,",q->value(48).toInt())+
|
||||||
|
QString().sprintf("MUS_ANNC_TYPE_OFFSET=%d,",q->value(49).toInt())+
|
||||||
|
QString().sprintf("MUS_ANNC_TYPE_LENGTH=%d,",q->value(50).toInt())+
|
||||||
"NAME=\""+RDEscapeString(name)+"\"";
|
"NAME=\""+RDEscapeString(name)+"\"";
|
||||||
|
delete q;
|
||||||
q=new RDSqlQuery(sql);
|
q=new RDSqlQuery(sql);
|
||||||
delete q;
|
delete q;
|
||||||
sql=QString("select HOUR,CLOCK_NAME from SERVICE_CLOCKS where ")+
|
sql=QString("select HOUR,CLOCK_NAME from SERVICE_CLOCKS where ")+
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user