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

2018-08-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdadmin(1) that caused creation of a new host
	entry to fail.
This commit is contained in:
Fred Gleason 2018-08-17 07:47:39 -04:00
parent ddb20266af
commit a078de0473
3 changed files with 28 additions and 2439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17457,3 +17457,6 @@
character set in rddbmgr(8). character set in rddbmgr(8).
2018-08-16 Fred Gleason <fredg@paravelsystems.com> 2018-08-16 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up warning in 'RDTempFile()'. * Cleaned up warning in 'RDTempFile()'.
2018-08-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdadmin(1) that caused creation of a new host
entry to fail.

2410
lib/rddb.cpp
View File

File diff suppressed because it is too large Load Diff

54
lib/rdstation.cpp
View File

@ -2,7 +2,7 @@
// //
// Abstract a Rivendell Workstation. // Abstract a Rivendell Workstation.
// //
// (C) Copyright 2002-2010,2016-2018 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@ -847,20 +847,18 @@ bool RDStation::create(const QString &name,QString *err_msg,
"SYSTEM_MAINT,"+ // 08 "SYSTEM_MAINT,"+ // 08
"HTTP_STATION,"+ // 09 "HTTP_STATION,"+ // 09
"CAE_STATION,"+ // 10 "CAE_STATION,"+ // 10
"BACKUP_DIR,"+ // 11 "START_JACK,"+ // 11
"BACKUP_LIFE,"+ // 12 "JACK_SERVER_NAME,"+ // 12
"START_JACK,"+ // 13 "JACK_COMMAND_LINE,"+ // 13
"JACK_SERVER_NAME,"+ // 14 "JACK_PORTS,"+ // 14
"JACK_COMMAND_LINE,"+ // 15 "CUE_CARD,"+ // 15
"JACK_PORTS,"+ // 16 "CUE_PORT,"+ // 16
"CUE_CARD,"+ // 17 "CUE_START_CART,"+ // 17
"CUE_PORT,"+ // 18 "CUE_STOP_CART,"+ // 18
"CUE_START_CART,"+ // 19 "CARTSLOT_COLUMNS,"+ // 19
"CUE_STOP_CART,"+ // 20 "CARTSLOT_ROWS,"+ // 20
"CARTSLOT_COLUMNS,"+ // 21 "ENABLE_DRAGDROP,"+ // 21
"CARTSLOT_ROWS,"+ // 22 "ENFORCE_PANEL_SETUP "+ // 22
"ENABLE_DRAGDROP,"+ // 23
"ENFORCE_PANEL_SETUP "+ // 24
"from STATIONS where "+ "from STATIONS where "+
"NAME=\""+RDEscapeString(exemplar)+"\""; "NAME=\""+RDEscapeString(exemplar)+"\"";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
@ -882,20 +880,18 @@ bool RDStation::create(const QString &name,QString *err_msg,
"SYSTEM_MAINT=\""+RDEscapeString(q->value(8).toString())+"\","+ "SYSTEM_MAINT=\""+RDEscapeString(q->value(8).toString())+"\","+
"HTTP_STATION=\""+RDEscapeString(q->value(9).toString())+"\","+ "HTTP_STATION=\""+RDEscapeString(q->value(9).toString())+"\","+
"CAE_STATION=\""+RDEscapeString(q->value(10).toString())+"\","+ "CAE_STATION=\""+RDEscapeString(q->value(10).toString())+"\","+
"BACKUP_DIR=\""+RDEscapeString(q->value(11).toString())+"\","+ "START_JACK=\""+RDEscapeString(q->value(11).toString())+"\","+
QString().sprintf("BACKUP_LIFE=%d,",q->value(12).toInt())+ "JACK_SERVER_NAME=\""+RDEscapeString(q->value(12).toString())+"\","+
"START_JACK=\""+RDEscapeString(q->value(13).toString())+"\","+ "JACK_COMMAND_LINE=\""+RDEscapeString(q->value(13).toString())+"\","+
"JACK_SERVER_NAME=\""+RDEscapeString(q->value(14).toString())+"\","+ QString().sprintf("JACK_PORTS=%d,",q->value(14).toInt())+
"JACK_COMMAND_LINE=\""+RDEscapeString(q->value(15).toString())+"\","+ QString().sprintf("CUE_CARD=%d,",q->value(15).toInt())+
QString().sprintf("JACK_PORTS=%d,",q->value(16).toInt())+ QString().sprintf("CUE_PORT=%d,",q->value(16).toInt())+
QString().sprintf("CUE_CARD=%d,",q->value(17).toInt())+ QString().sprintf("CUE_START_CART=%u,",q->value(17).toInt())+
QString().sprintf("CUE_PORT=%d,",q->value(18).toInt())+ QString().sprintf("CUE_STOP_CART=%u,",q->value(18).toInt())+
QString().sprintf("CUE_START_CART=%u,",q->value(19).toInt())+ QString().sprintf("CARTSLOT_COLUMNS=%d,",q->value(19).toInt())+
QString().sprintf("CUE_STOP_CART=%u,",q->value(20).toInt())+ QString().sprintf("CARTSLOT_ROWS=%d,",q->value(20).toInt())+
QString().sprintf("CARTSLOT_COLUMNS=%d,",q->value(21).toInt())+ "ENABLE_DRAGDROP=\""+RDEscapeString(q->value(21).toString())+"\","+
QString().sprintf("CARTSLOT_ROWS=%d,",q->value(22).toInt())+ "ENFORCE_PANEL_SETUP=\""+RDEscapeString(q->value(22).toString())+"\"";
"ENABLE_DRAGDROP=\""+RDEscapeString(q->value(23).toString())+"\","+
"ENFORCE_PANEL_SETUP=\""+RDEscapeString(q->value(24).toString())+"\"";
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
if(!q1->isActive()) { if(!q1->isActive()) {
*err_msg=QObject::tr("host already exists"); *err_msg=QObject::tr("host already exists");