Fixed conflicts in 'ChangeLog' and 'utils/rddbmgr/schemamap.cpp'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-07-07 11:33:13 -04:00
15 changed files with 159 additions and 53 deletions

View File

@@ -249,7 +249,8 @@ bool MainObject::StartDropboxes(QString *err_msg)
"`FORCE_TO_MONO`,"+ // 21
"`SEGUE_LEVEL`,"+ // 22
"`SEGUE_LENGTH`,"+ // 23
"`SEND_EMAIL` "+ // 24
"`SEND_EMAIL`,"+ // 24
"`UPDATE_METADATA` "+ // 25
"from `DROPBOXES` where "+
"`STATION_NAME`='"+RDEscapeString(rda->config()->stationName())+"'";
q=new RDSqlQuery(sql);
@@ -305,6 +306,9 @@ bool MainObject::StartDropboxes(QString *err_msg)
args.push_back("--send-mail");
args.push_back("--mail-per-file");
}
if(q->value(25).toString()=="Y") {
args.push_back("--update-metadata");
}
if(q->value(17).toString()=="Y") {
args.push_back(QString::asprintf("--create-startdate-offset=%d",
q->value(18).toInt()));