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

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

Browse Source 
* Added a 'SERVICES.INCLUDE_IMPORT_MARKERS' field to the database.
	* Added a 'LOGS.INCLUDE_IMPORT_MARKERS' field to the database.
	* Incremented the database version to 301.
	* Added an 'Inlcude Import Markers in Finished Logs' checkbox to
	the 'Edit Service' dialog in rdadmin(1).
This commit is contained in:
Fred Gleason
2018-11-29 14:44:38 -05:00
parent 4220a2c9d4
commit a9a3f385ad
33 changed files with 302 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/rdsvc.cpp
View File

@@ -180,6 +180,20 @@ void RDSvc::setElrShelflife(int days) const
}
bool RDSvc::includeImportMarkers() const
{
return
RDBool(RDGetSqlValue("SERVICES","NAME",svc_name,"INCLUDE_IMPORT_MARKERS").
toString());
}
void RDSvc::setIncludeImportMarkers(bool state)
{
SetRow("INCLUDE_IMPORT_MARKERS",RDYesNo(state));
}
bool RDSvc::chainto() const
{
return
@@ -722,6 +736,7 @@ bool RDSvc::generateLog(const QDate &date,const QString &logname,
log=new RDLog(logname);
log->setDescription(RDDateDecode(descriptionTemplate(),date,svc_station,
svc_config,svc_name));
log->setIncludeImportMarkers(includeImportMarkers());
emit generationProgress(1);
@@ -805,6 +820,26 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
return false;
}
//
// Calculate Source
//
RDLogLine::Type src_type=RDLogLine::UnknownType;
RDLog::Source link_src=RDLog::SourceMusic;
switch(src) {
case RDSvc::Music:
src_type=RDLogLine::MusicLink;
link_src=RDLog::SourceMusic;
break;
case RDSvc::Traffic:
src_type=RDLogLine::TrafficLink;
link_src=RDLog::SourceTraffic;
break;
}
RDLog *log=new RDLog(logname);
int current_link=0;
int total_links=log->linkQuantity(link_src);
emit generationProgress(0);
//
@@ -825,26 +860,6 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
return false;
}
//
// Calculate Source
//
RDLogLine::Type src_type=RDLogLine::UnknownType;
RDLog::Source link_src=RDLog::SourceMusic;
switch(src) {
case RDSvc::Music:
src_type=RDLogLine::MusicLink;
link_src=RDLog::SourceMusic;
break;
case RDSvc::Traffic:
src_type=RDLogLine::TrafficLink;
link_src=RDLog::SourceTraffic;
break;
}
RDLog *log=new RDLog(logname);
int current_link=0;
int total_links=log->linkQuantity(link_src);
//
// Iterate Through the Log
//
@@ -858,8 +873,8 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
RDEventLine *e=new RDEventLine(svc_station);
e->setName(logline->linkEventName());
e->load();
e->linkLog(dest_event,svc_name,logline,track_str,label_cart,track_cart,
&autofill_errors);
e->linkLog(dest_event,log,svc_name,logline,track_str,label_cart,
track_cart,&autofill_errors);
delete e;
emit generationProgress(1+(24*current_link++)/total_links);
}