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

2018-11-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'SERVICES.MUS_WIN_PATH', 'SERVICES.MUS_WIN_PREIMPORT_CMD'
	'SERVICES.TFC_WIN_PATH', and 'SERVICES.TFC_WIN_PREIMPORT_CMD' fields
	from the database.
	* Incremented the database version to 300.
	* Removed the 'RDSvc::ImportOs' enumeration.
	* Removed the 'Windows Import Path' and 'Windows Preimport Command'
	fields from the 'Edit Service' dialog in rdadmin(1).
This commit is contained in:
Fred Gleason 2018-11-21 09:56:54 -05:00
parent ce560d1c25
commit 10b08d65a8
18 changed files with 171 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -18047,3 +18047,11 @@
* Fixed a typo in the systemd unit file that caused an
"Unknown lvalue 'RestartLimitInterval' in section 'Service'" warning
to be generated when installing the base RPM.
2018-11-21 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'SERVICES.MUS_WIN_PATH', 'SERVICES.MUS_WIN_PREIMPORT_CMD'
'SERVICES.TFC_WIN_PATH', and 'SERVICES.TFC_WIN_PREIMPORT_CMD' fields
from the database.
* Incremented the database version to 300.
* Removed the 'RDSvc::ImportOs' enumeration.
* Removed the 'Windows Import Path' and 'Windows Preimport Command'
fields from the 'Edit Service' dialog in rdadmin(1).

2
lib/dbversion.h
View File

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

33
lib/rdsvc.cpp
View File

@ -264,34 +264,33 @@ void RDSvc::setTrackCart(ImportSource src,const QString &str)
}
QString RDSvc::importPath(ImportSource src,ImportOs os) const
QString RDSvc::importPath(ImportSource src) const
{
QString fieldname=SourceString(src)+OsString(os)+"PATH";
QString fieldname=SourceString(src)+"PATH";
return RDGetSqlValue("SERVICES","NAME",svc_name,fieldname).
toString();
}
void RDSvc::setImportPath(ImportSource src,ImportOs os,const QString &path)
void RDSvc::setImportPath(ImportSource src,const QString &path)
const
{
QString fieldname=SourceString(src)+OsString(os)+"PATH";
QString fieldname=SourceString(src)+"PATH";
SetRow(fieldname,path);
}
QString RDSvc::preimportCommand(ImportSource src,ImportOs os) const
QString RDSvc::preimportCommand(ImportSource src) const
{
QString fieldname=SourceString(src)+OsString(os)+"PREIMPORT_CMD";
QString fieldname=SourceString(src)+"PREIMPORT_CMD";
return RDGetSqlValue("SERVICES","NAME",svc_name,fieldname).
toString();
}
void RDSvc::setPreimportCommand(ImportSource src,ImportOs os,
const QString &path) const
void RDSvc::setPreimportCommand(ImportSource src,const QString &path) const
{
QString fieldname=SourceString(src)+OsString(os)+"PREIMPORT_CMD";
QString fieldname=SourceString(src)+"PREIMPORT_CMD";
SetRow(fieldname,path);
}
@ -1453,22 +1452,6 @@ QString RDSvc::SourceString(ImportSource src) const
}
QString RDSvc::OsString(ImportOs os) const
{
QString fieldname;
switch(os) {
case RDSvc::Linux:
fieldname="";
break;
case RDSvc::Windows:
fieldname="WIN_";
break;
}
return fieldname;
}
QString RDSvc::FieldString(ImportField field) const
{
QString fieldname;

11
lib/rdsvc.h
View File

@ -35,7 +35,6 @@ class RDSvc : public QObject
{
Q_OBJECT
public:
enum ImportOs {Linux=0,Windows=1};
enum ImportSource {Traffic=0,Music=1};
enum ImportField {CartNumber=0,ExtData=3,ExtEventId=4,ExtAnncType=5,
Title=6,StartHours=7,StartMinutes=8,StartSeconds=9,
@ -76,11 +75,10 @@ class RDSvc : public QObject
void setLabelCart(ImportSource src,const QString &str);
QString trackCart(ImportSource src) const;
void setTrackCart(ImportSource src,const QString &str);
QString importPath(ImportSource src,ImportOs os) const;
void setImportPath(ImportSource src,ImportOs os,const QString &path) const;
QString preimportCommand(ImportSource src,ImportOs os) const;
void setPreimportCommand(ImportSource src,ImportOs os,
const QString &path) const;
QString importPath(ImportSource src) const;
void setImportPath(ImportSource src,const QString &path) const;
QString preimportCommand(ImportSource src) const;
void setPreimportCommand(ImportSource src,const QString &path) const;
int importOffset(ImportSource src,ImportField field) const;
void setImportOffset(ImportSource src,ImportField field,int offset) const;
int importLength(ImportSource src,ImportField field) const;
@ -111,7 +109,6 @@ class RDSvc : public QObject
private:
bool TryLock(RDLogLock *lock,QString *err_msg);
QString SourceString(ImportSource src) const;
QString OsString(ImportOs os) const;
QString FieldString(ImportField field) const;
void SetRow(const QString &param,QString value) const;
void SetRow(const QString &param,int value) const;

123
rdadmin/edit_svc.cpp
View File

@ -18,17 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qlabel.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <q3buttongroup.h>
#include <rd.h>
#include <rdapplication.h>
@ -257,7 +247,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
svc_tfc_path_edit->setGeometry(185,234,240,19);
svc_tfc_path_edit->setMaxLength(255);
svc_tfc_path_edit->setValidator(validator);
label=new QLabel(svc_tfc_path_edit,tr("Linux Import Path:"),this);
label=new QLabel(svc_tfc_path_edit,tr("Import Path:"),this);
label->setGeometry(10,234,170,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_tfc_path_edit,SIGNAL(textChanged(const QString &)),
@ -270,12 +260,13 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
svc_tfc_preimport_cmd_edit->setGeometry(185,255,240,19);
svc_tfc_preimport_cmd_edit->setValidator(validator);
label=
new QLabel(svc_tfc_preimport_cmd_edit,tr("Linux Preimport Command:"),this);
new QLabel(svc_tfc_preimport_cmd_edit,tr("Preimport Command:"),this);
label->setGeometry(10,255,170,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_tfc_preimport_cmd_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
/*
//
// Windows Traffic Import Path
//
@ -299,15 +290,15 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_tfc_win_preimport_cmd_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
*/
//
// Note Cart
//
svc_tfc_label_cart_edit=new QLineEdit(this);
svc_tfc_label_cart_edit->setGeometry(185,318,240,19);
svc_tfc_label_cart_edit->setGeometry(185,276,240,19);
svc_tfc_label_cart_edit->setMaxLength(32);
label=new QLabel(svc_tfc_label_cart_edit,tr("Note Cart String:"),this);
label->setGeometry(10,318,170,19);
label->setGeometry(10,276,170,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_tfc_label_cart_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
@ -316,10 +307,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
// Track String
//
svc_tfc_track_edit=new QLineEdit(this);
svc_tfc_track_edit->setGeometry(185,339,240,19);
svc_tfc_track_edit->setGeometry(185,297,240,19);
svc_tfc_track_edit->setMaxLength(32);
label=new QLabel(svc_tfc_track_edit,tr("Insert Voice Track String:"),this);
label->setGeometry(10,339,170,19);
label->setGeometry(10,297,170,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_tfc_track_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
@ -328,9 +319,9 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
// Traffic Import Template
//
svc_tfc_import_template_box=new QComboBox(this);
svc_tfc_import_template_box->setGeometry(185,360,240,19);
svc_tfc_import_template_box->setGeometry(185,318,240,19);
label=new QLabel(svc_tfc_import_template_box,tr("Import Template:"),this);
label->setGeometry(10,360,170,19);
label->setGeometry(10,318,170,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_tfc_import_template_box,SIGNAL(activated(int)),
this,SLOT(tfcTemplateActivatedData(int)));
@ -339,14 +330,14 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
// Traffic Parser Settings
//
svc_tfc_fields=new ImportFields(this);
svc_tfc_fields->setGeometry(10,381,svc_tfc_fields->sizeHint().width(),
svc_tfc_fields->setGeometry(10,339,svc_tfc_fields->sizeHint().width(),
svc_tfc_fields->sizeHint().height());
//
// Traffic Test Button
//
button=new QPushButton(this);
button->setGeometry(360,381,60,40);
button->setGeometry(360,339,60,40);
button->setFont(font);
button->setText(tr("Test \n&Traffic"));
connect(button,SIGNAL(clicked()),this,SLOT(trafficData()));
@ -366,7 +357,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
svc_mus_path_edit->setGeometry(620,234,240,19);
svc_mus_path_edit->setMaxLength(255);
svc_mus_path_edit->setValidator(validator);
label=new QLabel(svc_mus_path_edit,tr("Linux Import Path:"),this);
label=new QLabel(svc_mus_path_edit,tr("Import Path:"),this);
label->setGeometry(450,234,165,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_path_edit,SIGNAL(textChanged(const QString &)),
@ -379,44 +370,20 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
svc_mus_preimport_cmd_edit->setGeometry(620,255,240,19);
svc_mus_preimport_cmd_edit->setValidator(validator);
label=
new QLabel(svc_mus_preimport_cmd_edit,tr("Linux Preimport Command:"),this);
label->setGeometry(450,255,170,19);
new QLabel(svc_mus_preimport_cmd_edit,tr("Preimport Command:"),this);
label->setGeometry(450,255,165,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_preimport_cmd_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
//
// Windows Music Import Path
//
svc_mus_win_path_edit=new QLineEdit(this);
svc_mus_win_path_edit->setGeometry(620,276,240,19);
svc_mus_win_path_edit->setMaxLength(255);
label=new QLabel(svc_mus_win_path_edit,tr("Windows Import Path:"),this);
label->setGeometry(450,276,165,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_win_path_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
//
// Windows Music Preimport Command
//
svc_mus_win_preimport_cmd_edit=new QLineEdit(this);
svc_mus_win_preimport_cmd_edit->setGeometry(620,297,240,19);
label=new QLabel(svc_mus_win_preimport_cmd_edit,
tr("Windows Preimport Command:"),this);
label->setGeometry(450,297,170,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_win_preimport_cmd_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
//
// Label Cart
//
svc_mus_label_cart_edit=new QLineEdit(this);
svc_mus_label_cart_edit->setGeometry(620,318,240,19);
svc_mus_label_cart_edit->setGeometry(620,276,240,19);
svc_mus_label_cart_edit->setMaxLength(32);
label=new QLabel(svc_mus_label_cart_edit,tr("Note Cart String:"),this);
label->setGeometry(450,318,170,19);
label->setGeometry(450,276,165,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_label_cart_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
@ -425,10 +392,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
// Insert Voice Track String
//
svc_mus_track_edit=new QLineEdit(this);
svc_mus_track_edit->setGeometry(620,339,240,19);
svc_mus_track_edit->setGeometry(620,297,240,19);
svc_mus_track_edit->setMaxLength(255);
label=new QLabel(svc_mus_track_edit,tr("Insert Voice Track String:"),this);
label->setGeometry(450,339,165,19);
label->setGeometry(450,297,165,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_track_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
@ -437,10 +404,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
// Insert Spot Break String
//
svc_mus_break_edit=new QLineEdit(this);
svc_mus_break_edit->setGeometry(620,360,240,19);
svc_mus_break_edit->setGeometry(620,318,240,19);
svc_mus_break_edit->setMaxLength(255);
label=new QLabel(svc_mus_break_edit,tr("Insert Traffic Break String:"),this);
label->setGeometry(450,360,165,19);
label->setGeometry(450,318,165,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_break_edit,SIGNAL(textChanged(const QString &)),
this,SLOT(textChangedData(const QString &)));
@ -449,9 +416,9 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
// Music Import Template
//
svc_mus_import_template_box=new QComboBox(this);
svc_mus_import_template_box->setGeometry(620,381,240,19);
svc_mus_import_template_box->setGeometry(620,339,240,19);
label=new QLabel(svc_mus_import_template_box,tr("Import Template:"),this);
label->setGeometry(450,381,170,19);
label->setGeometry(450,339,165,19);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(svc_mus_import_template_box,SIGNAL(activated(int)),
this,SLOT(musTemplateActivatedData(int)));
@ -460,14 +427,14 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
// Music Parser Settings
//
svc_mus_fields=new ImportFields(this);
svc_mus_fields->setGeometry(445,402,svc_mus_fields->sizeHint().width(),
svc_mus_fields->setGeometry(445,360,svc_mus_fields->sizeHint().width(),
svc_mus_fields->sizeHint().height());
//
// Music Test Button
//
button=new QPushButton(this);
button->setGeometry(795,402,60,40);
button->setGeometry(795,360,60,40);
button->setFont(font);
button->setText(tr("Test \n&Music"));
connect(button,SIGNAL(clicked()),this,SLOT(musicData()));
@ -539,14 +506,9 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
else {
svc_shelflife_spin->setDisabled(true);
}
svc_tfc_path_edit->setText(svc_svc->importPath(RDSvc::Traffic,RDSvc::Linux));
svc_tfc_path_edit->setText(svc_svc->importPath(RDSvc::Traffic));
svc_tfc_preimport_cmd_edit->
setText(svc_svc->preimportCommand(RDSvc::Traffic,RDSvc::Linux));
svc_tfc_win_path_edit->
setText(svc_svc->importPath(RDSvc::Traffic,RDSvc::Windows));
svc_tfc_win_preimport_cmd_edit->
setText(svc_svc->preimportCommand(RDSvc::Traffic,RDSvc::Windows));
setText(svc_svc->preimportCommand(RDSvc::Traffic));
svc_tfc_import_template_box->insertItem(tr("[custom]"));
svc_mus_import_template_box->insertItem(tr("[custom]"));
sql="select NAME from IMPORT_TEMPLATES order by NAME";
@ -566,13 +528,9 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
delete q;
svc_tfc_label_cart_edit->setText(svc_svc->labelCart(RDSvc::Traffic));
svc_tfc_track_edit->setText(svc_svc->trackString(RDSvc::Traffic));
svc_mus_path_edit->setText(svc_svc->importPath(RDSvc::Music,RDSvc::Linux));
svc_mus_path_edit->setText(svc_svc->importPath(RDSvc::Music));
svc_mus_preimport_cmd_edit->
setText(svc_svc->preimportCommand(RDSvc::Music,RDSvc::Linux));
svc_mus_win_path_edit->
setText(svc_svc->importPath(RDSvc::Music,RDSvc::Windows));
svc_mus_win_preimport_cmd_edit->
setText(svc_svc->preimportCommand(RDSvc::Music,RDSvc::Windows));
setText(svc_svc->preimportCommand(RDSvc::Music));
svc_mus_label_cart_edit->setText(svc_svc->labelCart(RDSvc::Music));
svc_mus_break_edit->
setText(svc_svc->breakString());
@ -595,7 +553,7 @@ EditSvc::~EditSvc()
QSize EditSvc::sizeHint() const
{
return QSize(870,712);
return QSize(870,670);
}
@ -710,16 +668,9 @@ void EditSvc::Save()
else {
svc_svc->setElrShelflife(-1);
}
svc_svc->setImportPath(RDSvc::Traffic,svc_tfc_path_edit->text());
svc_svc->
setImportPath(RDSvc::Traffic,RDSvc::Linux,svc_tfc_path_edit->text());
svc_svc->
setPreimportCommand(RDSvc::Traffic,RDSvc::Linux,
svc_tfc_preimport_cmd_edit->text());
svc_svc->
setImportPath(RDSvc::Traffic,RDSvc::Windows,svc_tfc_win_path_edit->text());
svc_svc->
setPreimportCommand(RDSvc::Traffic,RDSvc::Windows,
svc_tfc_win_preimport_cmd_edit->text());
setPreimportCommand(RDSvc::Traffic,svc_tfc_preimport_cmd_edit->text());
if(svc_tfc_import_template_box->currentItem()==0) {
svc_svc->setImportTemplate(RDSvc::Traffic,"");
}
@ -730,14 +681,8 @@ void EditSvc::Save()
svc_svc->setLabelCart(RDSvc::Traffic,svc_tfc_label_cart_edit->text());
svc_svc->setTrackString(RDSvc::Traffic,svc_tfc_track_edit->text());
svc_tfc_fields->readFields(svc_svc,RDSvc::Traffic);
svc_svc->setImportPath(RDSvc::Music,RDSvc::Linux,svc_mus_path_edit->text());
svc_svc->setPreimportCommand(RDSvc::Music,RDSvc::Linux,
svc_mus_preimport_cmd_edit->text());
svc_svc->
setImportPath(RDSvc::Music,RDSvc::Windows,svc_mus_win_path_edit->text());
svc_svc->
setPreimportCommand(RDSvc::Music,RDSvc::Windows,
svc_mus_win_preimport_cmd_edit->text());
svc_svc->setImportPath(RDSvc::Music,svc_mus_path_edit->text());
svc_svc->setPreimportCommand(RDSvc::Music,svc_mus_preimport_cmd_edit->text());
if(svc_mus_import_template_box->currentItem()==0) {
svc_svc->setImportTemplate(RDSvc::Music,"");
}

4
rdadmin/edit_svc.h
View File

@ -65,8 +65,6 @@ class EditSvc : public QDialog
QComboBox *svc_autospot_group_box;
QLineEdit *svc_tfc_path_edit;
QLineEdit *svc_tfc_preimport_cmd_edit;
QLineEdit *svc_tfc_win_path_edit;
QLineEdit *svc_tfc_win_preimport_cmd_edit;
QComboBox *svc_tfc_import_template_box;
QLineEdit *svc_tfc_label_cart_edit;
QLineEdit *svc_tfc_track_edit;
@ -74,8 +72,6 @@ class EditSvc : public QDialog
ImportFields *svc_mus_fields;
QLineEdit *svc_mus_path_edit;
QLineEdit *svc_mus_preimport_cmd_edit;
QLineEdit *svc_mus_win_path_edit;
QLineEdit *svc_mus_win_preimport_cmd_edit;
QComboBox *svc_mus_import_template_box;
QLineEdit *svc_mus_label_cart_edit;
QLineEdit *svc_mus_break_edit;

16
rdadmin/rdadmin_cs.ts
View File

@ -3863,11 +3863,11 @@ Ports</source>
</message>
<message>
<source>Linux Import Path:</source>
<translation>Cesta pro zavedení v Linuxu:</translation>
<translation type="obsolete">Cesta pro zavedení v Linuxu:</translation>
</message>
<message>
<source>Windows Import Path:</source>
<translation>Cesta pro zavedení ve Windows:</translation>
<translation type="obsolete">Cesta pro zavedení ve Windows:</translation>
</message>
<message>
<source>Note Cart String:</source>
@ -3989,11 +3989,11 @@ uloženo. Uložit nyní?</translation>
</message>
<message>
<source>Linux Preimport Command:</source>
<translation>Příkaz pro před-zavedení v Linuxu:</translation>
<translation type="obsolete">Příkaz pro před-zavedení v Linuxu:</translation>
</message>
<message>
<source>Windows Preimport Command:</source>
<translation>Příkaz pro před-zavedení ve Windows:</translation>
<translation type="obsolete">Příkaz pro před-zavedení ve Windows:</translation>
</message>
<message>
<source>&amp;Program Code:</source>
@ -4035,6 +4035,14 @@ uloženo. Uložit nyní?</translation>
<source>creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditSvcPerms</name>

16
rdadmin/rdadmin_de.ts
View File

@ -3748,11 +3748,11 @@ konfigurieren</translation>
</message>
<message>
<source>Linux Import Path:</source>
<translation>Linux Importpfad:</translation>
<translation type="obsolete">Linux Importpfad:</translation>
</message>
<message>
<source>Windows Import Path:</source>
<translation>Windowsimportpfad:</translation>
<translation type="obsolete">Windowsimportpfad:</translation>
</message>
<message>
<source>Note Cart String:</source>
@ -3874,11 +3874,11 @@ gespeichert werden. Jetzt speichern?</translation>
</message>
<message>
<source>Linux Preimport Command:</source>
<translation>Vor-Import-Befehl Linux:</translation>
<translation type="obsolete">Vor-Import-Befehl Linux:</translation>
</message>
<message>
<source>Windows Preimport Command:</source>
<translation>Vor-Import-Befehl Windows:</translation>
<translation type="obsolete">Vor-Import-Befehl Windows:</translation>
</message>
<message>
<source>&amp;Program Code:</source>
@ -3920,6 +3920,14 @@ gespeichert werden. Jetzt speichern?</translation>
<source>creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditSvcPerms</name>

16
rdadmin/rdadmin_es.ts
View File

@ -3872,11 +3872,11 @@ Ports</source>
</message>
<message>
<source>Linux Import Path:</source>
<translation>Importar desde (Linux):</translation>
<translation type="obsolete">Importar desde (Linux):</translation>
</message>
<message>
<source>Windows Import Path:</source>
<translation>Importar desde (Windows):</translation>
<translation type="obsolete">Importar desde (Windows):</translation>
</message>
<message>
<source>Note Cart String:</source>
@ -3946,11 +3946,11 @@ debe guardarse. ¿Hacerlo ahora?</translation>
</message>
<message>
<source>Linux Preimport Command:</source>
<translation>Cmd antes de importar (Linux):</translation>
<translation type="obsolete">Cmd antes de importar (Linux):</translation>
</message>
<message>
<source>Windows Preimport Command:</source>
<translation>Cmd antes de importar (Win):</translation>
<translation type="obsolete">Cmd antes de importar (Win):</translation>
</message>
<message>
<source>&amp;Program Code:</source>
@ -3992,6 +3992,14 @@ debe guardarse. ¿Hacerlo ahora?</translation>
<source>creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditSvcPerms</name>

24
rdadmin/rdadmin_fr.ts
View File

@ -3274,14 +3274,6 @@ Ports</source>
<source>Traffic Data Import</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Linux Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Note Cart String:</source>
<translation type="unfinished"></translation>
@ -3333,14 +3325,6 @@ must be saved. Save now?</source>
<source>[custom]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Linux Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Program Code:</source>
<translation type="unfinished"></translation>
@ -3381,6 +3365,14 @@ must be saved. Save now?</source>
<source>creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditSvcPerms</name>

20
rdadmin/rdadmin_nb.ts
View File

@ -3713,11 +3713,11 @@ Ports</source>
</message>
<message>
<source>Linux Import Path:</source>
<translation>Linux-importstig:</translation>
<translation type="obsolete">Linux-importstig:</translation>
</message>
<message>
<source>Windows Import Path:</source>
<translation>Windows-importstig:</translation>
<translation type="obsolete">Windows-importstig:</translation>
</message>
<message>
<source>Note Cart String:</source>
@ -3829,14 +3829,6 @@ Lagre no?</translation>
<source>[custom]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Linux Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Program Code:</source>
<translation type="unfinished"></translation>
@ -3877,6 +3869,14 @@ Lagre no?</translation>
<source>creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditSvcPerms</name>

20
rdadmin/rdadmin_nn.ts
View File

@ -3713,11 +3713,11 @@ Ports</source>
</message>
<message>
<source>Linux Import Path:</source>
<translation>Linux-importstig:</translation>
<translation type="obsolete">Linux-importstig:</translation>
</message>
<message>
<source>Windows Import Path:</source>
<translation>Windows-importstig:</translation>
<translation type="obsolete">Windows-importstig:</translation>
</message>
<message>
<source>Note Cart String:</source>
@ -3829,14 +3829,6 @@ Lagre no?</translation>
<source>[custom]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Linux Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Program Code:</source>
<translation type="unfinished"></translation>
@ -3877,6 +3869,14 @@ Lagre no?</translation>
<source>creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditSvcPerms</name>

20
rdadmin/rdadmin_pt_BR.ts
View File

@ -3748,11 +3748,11 @@ de Preenchimento</translation>
</message>
<message>
<source>Linux Import Path:</source>
<translation>Pasta de importação - Linux:</translation>
<translation type="obsolete">Pasta de importação - Linux:</translation>
</message>
<message>
<source>Windows Import Path:</source>
<translation>Pasta de imp. - Windows:</translation>
<translation type="obsolete">Pasta de imp. - Windows:</translation>
</message>
<message>
<source>Note Cart String:</source>
@ -3856,14 +3856,6 @@ deve ser salva. Salvar Agora?</translation>
<source>&amp;Program Code:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Linux Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Windows Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Template:</source>
<translation type="unfinished"></translation>
@ -3908,6 +3900,14 @@ deve ser salva. Salvar Agora?</translation>
<source>creation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Import Path:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preimport Command:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditSvcPerms</name>

2
rdadmin/test_import.cpp
View File

@ -266,7 +266,7 @@ void TestImport::importData()
void TestImport::dateChangedData(const QDate &date)
{
test_filename_edit->
setText(RDDateDecode(test_svc->importPath(test_src,RDSvc::Linux),date,
setText(RDDateDecode(test_svc->importPath(test_src),date,
rda->station(),rda->config(),test_svc->name()));
}

30
utils/rddbmgr/revertschema.cpp
View File

@ -40,10 +40,40 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg)
// NEW SCHEMA REVERSIONS GO HERE...
//
// Revert 300
//
if((cur_schema==300)&&(set_schema<cur_schema)) {
sql=QString("alter table SERVICES add column TFC_WIN_PATH varchar(191) ")+
"after TFC_PREIMPORT_CMD";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString("alter table SERVICES add column TFC_WIN_PREIMPORT_CMD text ")+
"after TFC_WIN_PATH";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString("alter table SERVICES add column MUS_WIN_PATH varchar(191) ")+
"after MUS_PREIMPORT_CMD";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString("alter table SERVICES add column MUS_WIN_PREIMPORT_CMD text ")+
"after MUS_WIN_PATH";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
WriteSchemaVersion(--cur_schema);
}
//
// Revert 299
//
if((cur_schema==299)&&(set_schema<cur_schema)) {
QString schedcode;
q=new RDSqlQuery("alter table CART add column SCHED_CODES VARCHAR( 255 ) NULL default '.' after MACROS",false);

2
utils/rddbmgr/schemamap.cpp
View File

@ -140,7 +140,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["3.0"]=299;
global_version_map["3.0"]=300;
}

9
utils/rddbmgr/updateschema.cpp
View File

@ -9589,6 +9589,15 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
WriteSchemaVersion(++cur_schema);
}
if((cur_schema<300)&&(set_schema>cur_schema)) {
DropColumn("SERVICES","MUS_WIN_PATH");
DropColumn("SERVICES","MUS_WIN_PREIMPORT_CMD");
DropColumn("SERVICES","TFC_WIN_PATH");
DropColumn("SERVICES","TFC_WIN_PREIMPORT_CMD");
WriteSchemaVersion(++cur_schema);
}
// NEW SCHEMA UPDATES GO HERE...
//

2
utils/rddgimport/rddgimport.cpp
View File

@ -380,7 +380,7 @@ bool MainWidget::WriteTrafficFile()
//
// Open Output File
//
outname=RDDateDecode(dg_svc->importPath(RDSvc::Traffic,RDSvc::Linux),
outname=RDDateDecode(dg_svc->importPath(RDSvc::Traffic),
dg_date_edit->date(),rda->station(),
rda->config(),dg_svc->name());
if((f=fopen(outname,"w"))==NULL) {