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

* 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).
2026-01-12 23:55:56 +01:00 · 2018-11-29 14:44:38 -05:00
parent 4220a2c9d4
commit a9a3f385ad
33 changed files with 302 additions and 129 deletions
--- a/rdlogmanager/generate_log.cpp
+++ b/rdlogmanager/generate_log.cpp
@@ -390,29 +390,38 @@ void GenerateLog::musicData()
  RDLog *log=new RDLog(logname);
  if(((log->linkState(RDLog::SourceMusic)==RDLog::LinkDone)||
      (log->linkState(RDLog::SourceTraffic)==RDLog::LinkDone))) {
-    if(QMessageBox::question(this,"RDLogManager - "+tr("Music Exists"),
-			     tr("The log for")+" "+
-			     gen_date_edit->date().toString("MM/dd/yyyy")+" "+
-			     tr("already contains merged music and/or traffic data.")+"\n"+
-			     tr("Remerging it will remove this data.  Remerge?"),
-			     QMessageBox::Yes,QMessageBox::No)!=
-       QMessageBox::Yes) {
-      delete log;
-      delete svc;
-      return;
-    }
-    if((tracks=log->completedTracks())>0) {
-      if(QMessageBox::warning(this,"RDLogManager - "+tr("Tracks Exist"),
-			      tr("This will also delete the")+
-			      QString().sprintf(" %u ",tracks)+
-			      tr("voice tracks associated with this log.")+
-			      "\n"+tr("Continue?"),
-			      QMessageBox::Yes,QMessageBox::No)!=
+    if(log->includeImportMarkers()) {
+      if(QMessageBox::question(this,"RDLogManager - "+tr("Music Exists"),
+			       tr("The log for")+" "+
+			       gen_date_edit->date().toString("MM/dd/yyyy")+" "+
+			       tr("already contains merged music and/or traffic data.")+"\n"+
+			       tr("Remerging it will remove this data.  Remerge?"),
+			       QMessageBox::Yes,QMessageBox::No)!=
 	 QMessageBox::Yes) {
 	delete log;
 	delete svc;
 	return;
      }
+      if((tracks=log->completedTracks())>0) {
+	if(QMessageBox::warning(this,"RDLogManager - "+tr("Tracks Exist"),
+				tr("This will also delete the")+
+				QString().sprintf(" %u ",tracks)+
+				tr("voice tracks associated with this log.")+
+				"\n"+tr("Continue?"),
+				QMessageBox::Yes,QMessageBox::No)!=
+	   QMessageBox::Yes) {
+	  delete log;
+	  delete svc;
+	  return;
+	}
+      }
+    }
+    else {
+      QMessageBox::warning(this,"RDLogManager - "+tr("Error"),
+			   tr("The log for")+" "+
+			   gen_date_edit->date().toString("MM/dd/yyyy")+" "+
+			   tr("cannot be relinked."));
+      return;
    }
    log->removeTracks(rda->station(),rda->user(),rda->config());
    if(!svc->clearLogLinks(RDSvc::Traffic,logname,rda->user(),&err_msg)) {
@@ -461,15 +470,24 @@ void GenerateLog::trafficData()
 			       rda->station(),rda->config(),svc->name());
  RDLog *log=new RDLog(logname);
  if((log->linkState(RDLog::SourceTraffic)==RDLog::LinkDone)) {
-    if(QMessageBox::question(this,"RDLogManager - "+tr("Traffic Exists"),
-			     tr("The log for")+" "+
-			     gen_date_edit->date().toString("MM/dd/yyyy")+" "+
-			     tr("already contains merged traffic data.")+"\n"+
-			     tr("Remerging it will remove this data.  Remerge?"),
-			     QMessageBox::Yes,QMessageBox::No)!=
-       QMessageBox::Yes) {
-      delete log;
-      delete svc;
+    if(log->includeImportMarkers()) {
+      if(QMessageBox::question(this,"RDLogManager - "+tr("Traffic Exists"),
+			       tr("The log for")+" "+
+			       gen_date_edit->date().toString("MM/dd/yyyy")+" "+
+			       tr("already contains merged traffic data.")+"\n"+
+			       tr("Remerging it will remove this data.  Remerge?"),
+			       QMessageBox::Yes,QMessageBox::No)!=
+	 QMessageBox::Yes) {
+	delete log;
+	delete svc;
+	return;
+      }
+    }
+    else {
+      QMessageBox::warning(this,"RDLogManager - "+tr("Error"),
+			   tr("The log for")+" "+
+			   gen_date_edit->date().toString("MM/dd/yyyy")+" "+
+			   tr("cannot be relinked."));
      return;
    }
    if(!svc->clearLogLinks(RDSvc::Traffic,logname,rda->user(),&err_msg)) {
@@ -512,7 +530,9 @@ void GenerateLog::fileScanData()
  if(gen_music_enabled) {
    if(QFile::exists(svc->
 		     importFilename(RDSvc::Music,gen_date_edit->date()))) {
-      gen_music_button->setEnabled(true);
+      gen_music_button->setEnabled(log->includeImportMarkers()||
+				   (log->linkState(RDLog::SourceMusic)==
+				    RDLog::LinkMissing));
      gen_mus_avail_label->setPixmap(*gen_greenball_map);
    }
    else {
@@ -527,8 +547,11 @@ void GenerateLog::fileScanData()
    if(QFile::exists(svc->
 		     importFilename(RDSvc::Traffic,gen_date_edit->date()))) {
      gen_traffic_button->
-	setEnabled((!gen_music_enabled)||
-		   (log->linkState(RDLog::SourceMusic)==RDLog::LinkDone));
+	setEnabled(((!gen_music_enabled)||
+		    (log->linkState(RDLog::SourceMusic)==RDLog::LinkDone))&&
+		   (log->includeImportMarkers()||
+		    (log->linkState(RDLog::SourceTraffic)==
+		     RDLog::LinkMissing)));
      gen_tfc_avail_label->setPixmap(*gen_greenball_map);
    }
    else {
--- a/rdlogmanager/logobject.cpp
+++ b/rdlogmanager/logobject.cpp
@@ -132,6 +132,13 @@ void LogObject::userData()
 		(const char *)log->name().utf8());
 	exit(256);
      }
+      if((!log->includeImportMarkers())&&
+	 (log->linkState(RDLog::SourceMusic)!=RDLog::LinkMissing)) {
+	fprintf(stderr,
+		"rdlogmanager: music for log \"%s\" cannot be reimported\n",
+		(const char *)log->name().utf8());
+	exit(256);
+      }
      report="";
      log->removeTracks(rda->station(),rda->user(),rda->config());
      if(!svc->clearLogLinks(RDSvc::Traffic,logname,rda->user(),&err_msg)) {
@@ -168,6 +175,13 @@ void LogObject::userData()
 		(const char *)log->name().utf8());
 	exit(256);
      }
+      if((!log->includeImportMarkers())&&
+	 (log->linkState(RDLog::SourceTraffic)!=RDLog::LinkMissing)) {
+	fprintf(stderr,
+		"rdlogmanager: traffic for log \"%s\" cannot be reimported\n",
+		(const char *)log->name().utf8());
+	exit(256);
+      }
      report="";
      if(!svc->clearLogLinks(RDSvc::Traffic,logname,rda->user(),&err_msg)) {
 	fprintf(stderr,"rdlogmanager: %s\n",(const char *)err_msg);
--- a/rdlogmanager/rdlogmanager_cs.ts
+++ b/rdlogmanager/rdlogmanager_cs.ts
@@ -887,11 +887,11 @@ Pokračovat?</translation>
    </message>
    <message>
        <source>No Errors</source>
-        <translation>Žádné chyby</translation>
+        <translation type="unfinished">Žádné chyby</translation>
    </message>
    <message>
        <source>No exceptions found.</source>
-        <translation>Nenalezena žádná chyba.</translation>
+        <translation type="unfinished">Nenalezena žádná chyba.</translation>
    </message>
    <message>
        <source>already contains merged music and/or traffic data.
@@ -977,6 +977,10 @@ Opětovné sloučení tato data smaže. Sloučit znovu?</translation>
        <source>already contains merged traffic data.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>cannot be relinked.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ImportListView</name>
--- a/rdlogmanager/rdlogmanager_de.ts
+++ b/rdlogmanager/rdlogmanager_de.ts
@@ -887,11 +887,11 @@ Fortfahren?</translation>
    </message>
    <message>
        <source>No Errors</source>
-        <translation>Keine Fehler</translation>
+        <translation type="unfinished">Keine Fehler</translation>
    </message>
    <message>
        <source>No exceptions found.</source>
-        <translation>Keine Fehler gefunden.</translation>
+        <translation type="unfinished">Keine Fehler gefunden.</translation>
    </message>
    <message>
        <source>already contains merged music and/or traffic data.
@@ -977,6 +977,10 @@ Einbinden wird diese entfernen. Fortfahren?</translation>
        <source>already contains merged traffic data.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>cannot be relinked.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ImportListView</name>
--- a/rdlogmanager/rdlogmanager_es.ts
+++ b/rdlogmanager/rdlogmanager_es.ts
@@ -841,11 +841,11 @@ Do you want to save?</source>
    </message>
    <message>
        <source>No Errors</source>
-        <translation>No hubo errores</translation>
+        <translation type="unfinished">No hubo errores</translation>
    </message>
    <message>
        <source>No exceptions found.</source>
-        <translation>No se encontraron errores.</translation>
+        <translation type="unfinished">No se encontraron errores.</translation>
    </message>
    <message>
        <source>This will also delete the</source>
@@ -979,6 +979,10 @@ removerá estos datos.  ¿Remezclar?</translation>
        <source>already contains merged traffic data.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>cannot be relinked.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ImportListView</name>
--- a/rdlogmanager/rdlogmanager_fr.ts
+++ b/rdlogmanager/rdlogmanager_fr.ts
@@ -801,14 +801,6 @@ Do you want to save?</source>
        <source>Tracks Exist</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>No Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No exceptions found.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Music Exists</source>
        <translation type="unfinished"></translation>
@@ -877,6 +869,18 @@ Do you want to save?</source>
        <source>already contains merged traffic data.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>No Errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No exceptions found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cannot be relinked.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ImportListView</name>
--- a/rdlogmanager/rdlogmanager_nb.ts
+++ b/rdlogmanager/rdlogmanager_nb.ts
@@ -900,11 +900,11 @@ Hald fram?</translation>
    </message>
    <message>
        <source>No Errors</source>
-        <translation>Ingen feil</translation>
+        <translation type="unfinished">Ingen feil</translation>
    </message>
    <message>
        <source>No exceptions found.</source>
-        <translation>Fann ingen unntak.</translation>
+        <translation type="unfinished">Fann ingen unntak.</translation>
    </message>
    <message>
        <source>already contains merged music and/or traffic data.
@@ -982,6 +982,10 @@ Flettar du på nytt, vil du fjerna desse dataa. Flett på nytt?</translation>
        <source>already contains merged traffic data.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>cannot be relinked.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ImportListView</name>
--- a/rdlogmanager/rdlogmanager_nn.ts
+++ b/rdlogmanager/rdlogmanager_nn.ts
@@ -900,11 +900,11 @@ Hald fram?</translation>
    </message>
    <message>
        <source>No Errors</source>
-        <translation>Ingen feil</translation>
+        <translation type="unfinished">Ingen feil</translation>
    </message>
    <message>
        <source>No exceptions found.</source>
-        <translation>Fann ingen unntak.</translation>
+        <translation type="unfinished">Fann ingen unntak.</translation>
    </message>
    <message>
        <source>already contains merged music and/or traffic data.
@@ -982,6 +982,10 @@ Flettar du på nytt, vil du fjerna desse dataa. Flett på nytt?</translation>
        <source>already contains merged traffic data.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>cannot be relinked.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ImportListView</name>
--- a/rdlogmanager/rdlogmanager_pt_BR.ts
+++ b/rdlogmanager/rdlogmanager_pt_BR.ts
@@ -893,11 +893,11 @@ Continue</translation>
    </message>
    <message>
        <source>No Errors</source>
-        <translation>Sem Erros</translation>
+        <translation type="unfinished">Sem Erros</translation>
    </message>
    <message>
        <source>No exceptions found.</source>
-        <translation>Exceções não encontradas. Parabéns. </translation>
+        <translation type="unfinished">Exceções não encontradas. Parabéns. </translation>
    </message>
    <message>
        <source>already contains merged music and/or traffic data.
@@ -979,6 +979,10 @@ Re-agregar removerá estes dados.  Re-agregar? </translation>
        <source>already contains merged traffic data.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>cannot be relinked.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ImportListView</name>