Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 23:25:57 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Implemented a '%r' wildcard for Rivendell Host Name.
This commit is contained in:
Fred Gleason
2017-10-14 10:38:55 -04:00
parent 162ebe545b
commit fb9487810b
43 changed files with 211 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rdlogmanager/commandline_ops.cpp
View File

@@ -77,13 +77,14 @@ int RunLogOperation(int argc,char *argv[],const QString &svcname,
#ifndef WIN32
rduser=new RDUser(rdstation_conf->defaultName());
#endif // WIN32
RDSvc *svc=new RDSvc(svcname);
RDSvc *svc=new RDSvc(svcname,config);
if(!svc->exists()) {
fprintf(stderr,"rdlogmanager: no such service\n");
return 256;
}
QDate start_date=QDate::currentDate().addDays(1+start_offset);
QString logname=RDDateDecode(svc->nameTemplate(),start_date,svc->name());
QString logname=
RDDateDecode(svc->nameTemplate(),start_date,config,svc->name());
RDLog *log=new RDLog(logname);
//
@@ -107,9 +108,9 @@ int RunLogOperation(int argc,char *argv[],const QString &svcname,
delete q;
if(!svc->generateLog(start_date,
RDDateDecode(svc->nameTemplate(),start_date,
svc->name()),
config,svc->name()),
RDDateDecode(svc->nameTemplate(),start_date.addDays(1),
svc->name()),
config,svc->name()),
&unused_report)) {
fprintf(stderr,"rdlogmanager: unable to generate log\n");
return 256;
@@ -234,7 +235,7 @@ int RunReportOperation(int argc,char *argv[],const QString &rptname,
//
// Open Report Generator
//
RDReport *report=new RDReport(rptname);
RDReport *report=new RDReport(rptname,config);
if(!report->exists()) {
fprintf(stderr,"rdlogmanager: no such report\n");
return 256;