2018-02-15 Fred Gleason <fredg@paravelsystems.com>

* Added a 'SERVICES.LOG_SHELFLIFE_ORIGIN' field to the database.
	* Incremented the database version to 275.
	* Added a drop-down control to the 'Set Logs to auto-delete' control
	to allow origin to be specified in the 'Edit Service' dialog in
	rdadmin(1).
This commit is contained in:
Fred Gleason
2018-02-15 09:39:37 -05:00
parent 948ccf4d8f
commit 8f1bd700cd
23 changed files with 187 additions and 49 deletions

View File

@@ -158,6 +158,19 @@ void RDSvc::setDefaultLogShelflife(int days) const
}
RDSvc::ShelflifeOrigin RDSvc::logShelflifeOrigin() const
{
return (RDSvc::ShelflifeOrigin)RDGetSqlValue("SERVICES","NAME",svc_name,
"LOG_SHELFLIFE_ORIGIN").toInt();
}
void RDSvc::setLogShelflifeOrigin(RDSvc::ShelflifeOrigin orig)
{
SetRow("LOG_SHELFLIFE_ORIGIN",(int)orig);
}
int RDSvc::elrShelflife() const
{
return RDGetSqlValue("SERVICES","NAME",svc_name,"ELR_SHELFLIFE").toInt();
@@ -737,7 +750,7 @@ bool RDSvc::generateLog(const QDate &date,const QString &logname,
RDLog::remove(logname,svc_station,user,svc_config);
delete log_lock;
}
RDLog::create(logname,svc_name,"RDLogManager",err_msg,svc_config);
RDLog::create(logname,svc_name,date,"RDLogManager",err_msg,svc_config);
log_lock=new RDLogLock(logname,user,svc_station,this);
if(!TryLock(log_lock,err_msg)) {
delete log_lock;