Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-31 16:12:33 +02:00
Code Issues Projects Releases Wiki Activity

2017-10-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Implemented the '%s' wildcard in the report file path.
This commit is contained in:
Fred Gleason 2017-10-03 09:04:30 -04:00
parent 75883359b9
commit 70147e9345
14 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16037,3 +16037,5 @@
in the [Provisioning] section of rd.conf(5). in the [Provisioning] section of rd.conf(5).
2017-10-02 Fred Gleason <fredg@paravelsystems.com> 2017-10-02 Fred Gleason <fredg@paravelsystems.com>
* Added an '%s' datetime wildcard for Service Name. * Added an '%s' datetime wildcard for Service Name.
2017-10-03 Fred Gleason <fredg@paravelsystems.com>
* Implemented the '%s' wildcard in the report file path.

6
lib/export_bmiemr.cpp
View File

@ -39,9 +39,11 @@ bool RDReport::ExportBmiEmr(const QDate &startdate,const QDate &enddate,
QString station_format=stationFormat(); QString station_format=stationFormat();
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
// //

6
lib/export_cutlog.cpp
View File

@ -41,9 +41,11 @@ bool RDReport::ExportCutLog(const QDate &startdate,const QDate &enddate,
QString cart_num; QString cart_num;
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

6
lib/export_deltaflex.cpp
View File

@ -43,9 +43,11 @@ bool RDReport::ExportDeltaflex(const QDate &startdate,const QDate &enddate,
QString air_fmt; QString air_fmt;
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

6
lib/export_musicclassical.cpp
View File

@ -41,9 +41,11 @@ bool RDReport::ExportMusicClassical(const QDate &startdate,const QDate &enddate,
QString cart_num; QString cart_num;
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

6
lib/export_musicplayout.cpp
View File

@ -41,9 +41,11 @@ bool RDReport::ExportMusicPlayout(const QDate &startdate,const QDate &enddate,
QString cart_num; QString cart_num;
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

6
lib/export_musicsummary.cpp
View File

@ -40,9 +40,11 @@ bool RDReport::ExportMusicSummary(const QDate &startdate,const QDate &enddate,
QString str; QString str;
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

6
lib/export_nprsoundex.cpp
View File

@ -51,9 +51,11 @@ bool RDReport::ExportNprSoundEx(const QDate &startdate,const QDate &enddate,
QString channel_name=stationId(); QString channel_name=stationId();
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
if((f=fopen(filename,"wb"))==NULL) { if((f=fopen(filename,"wb"))==NULL) {
report_error_code=RDReport::ErrorCantOpen; report_error_code=RDReport::ErrorCantOpen;

6
lib/export_radiotraffic.cpp
View File

@ -38,9 +38,11 @@ bool RDReport::ExportRadioTraffic(const QDate &startdate,const QDate &enddate,
QString air_fmt; QString air_fmt;
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

6
lib/export_soundex.cpp
View File

@ -48,9 +48,11 @@ bool RDReport::ExportSoundEx(const QDate &startdate,const QDate &enddate,
QString channel_name=stationId(); QString channel_name=stationId();
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
// //

6
lib/export_spincount.cpp
View File

@ -50,9 +50,11 @@ bool RDReport::ExportSpinCount(const QDate &startdate,const QDate &enddate,
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

6
lib/export_technical.cpp
View File

@ -44,9 +44,11 @@ bool RDReport::ExportTechnical(const QDate &startdate,const QDate &enddate,
char eol[3]="\n"; char eol[3]="\n";
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
if(incl_crs) { if(incl_crs) {
strcpy(eol,"\r\n"); strcpy(eol,"\r\n");
} }

6
lib/export_textlog.cpp
View File

@ -42,9 +42,11 @@ bool RDReport::ExportTextLog(const QDate &startdate,const QDate &enddate,
QString cart_num; QString cart_num;
#ifdef WIN32 #ifdef WIN32
QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
#else #else
QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate); QString filename=
RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
#endif #endif
QFile file(filename); QFile file(filename);

3
rdadmin/test_import.cpp
View File

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