Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

Merged v2.17.0-remerge-fix

Browse Source
This commit is contained in:
Fred Gleason
2017-12-06 13:14:50 -05:00
parent 848e1602a3 cacb87a786
commit d29aaf619d
9 changed files with 187 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rdsvc.cpp
View File

@@ -27,6 +27,7 @@
#include <rdcreate_log.h>
#include <rdclock.h>
#include <rdlog.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdweb.h>
@@ -947,8 +948,7 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
}
void RDSvc::clearLogLinks(RDSvc::ImportSource src,const QDate &date,
const QString &logname)
void RDSvc::clearLogLinks(RDSvc::ImportSource src,const QString &logname)
{
std::vector<int> cleared_ids;
RDLogLine::Type event_type=RDLogLine::UnknownType;
@@ -1003,6 +1003,16 @@ void RDSvc::clearLogLinks(RDSvc::ImportSource src,const QDate &date,
dest_event->save(svc_config);
delete src_event;
delete dest_event;
RDLog *log=new RDLog(logname);
if(src==RDSvc::Traffic) {
log->setLinkState(RDLog::SourceTraffic,false);
}
if(src==RDSvc::Music) {
log->setLinkState(RDLog::SourceMusic,false);
}
delete log;
}

4
lib/rdsvc.h
View File

@@ -89,8 +89,8 @@ class RDSvc : public QObject
const QString &nextname,QString *report,RDUser *user);
bool linkLog(RDSvc::ImportSource src,const QDate &date,
const QString &logname,QString *report);
void clearLogLinks(RDSvc::ImportSource src,const QDate &date,
const QString &logname);
void clearLogLinks(RDSvc::ImportSource src,const QString &logname);
void create(const QString exemplar) const;
void remove() const;
QString xml() const;
static bool create(const QString &name,QString *err_msg,