2018-03-20 Fred Gleason <fredg@paravelsystems.com>

* Removed event checks when update Playout events in rdcatch(1).
2025-04-07 17:32:20 +02:00 · 2018-03-20 11:00:03 -04:00 · 2018-03-20 11:00:03 -04:00 · dbd4d865f9
commit dbd4d865f9
parent 5b8aea8b17
10 changed files with 14 additions and 100 deletions
--- a/2
+++ b/2
@ -16621,3 +16621,5 @@
 	* Incremented the package version to 2.19.0int00.
 2018-03-20 Fred Gleason <fredg@paravelsystems.com>
 	* Removed rdhpiinfo(8).
+2018-03-20 Fred Gleason <fredg@paravelsystems.com>
+	* Removed event checks when update Playout events in rdcatch(1).
--- a/rdcatch/edit_playout.cpp
+++ b/rdcatch/edit_playout.cpp
@ -333,11 +333,6 @@ void EditPlayout::selectCutData()

 void EditPlayout::saveasData()
 {
-  if(!CheckEvent(true)) {
-    QMessageBox::warning(this,tr("Duplicate Event"),
-		     tr("An event with these parameters already exists!"));
-    return;
-  }
  delete edit_recording;
  edit_recording=new RDRecording(-1,true);
  edit_added_events->push_back(edit_recording->id());
@ -347,11 +342,6 @@ void EditPlayout::saveasData()

 void EditPlayout::okData()
 {
-  if(!CheckEvent(false)) {
-    QMessageBox::warning(this,tr("Duplicate Event"),
-		     tr("An event with these parameters already exists!"));
-    return;
-  }
  Save();
  done(0);
 }
@ -451,72 +441,3 @@ void EditPlayout::Save()
  edit_recording->setSun(edit_sun_button->isChecked());
  edit_recording->setOneShot(edit_oneshot_box->isChecked());
 }
-
-
-bool EditPlayout::CheckEvent(bool include_myself)
-{
-  char station[65];
-  char gunk[3];
-  int chan;
-  QTime test_start_time;
-  QTime test_end_time;
-
-  RDCut *cut=new RDCut(edit_cutname);
-  QTime start_time=edit_starttime_edit->time();
-  QTime end_time=edit_starttime_edit->time().addMSecs(cut->length());
-  delete cut;
-
-  sscanf((const char *)edit_station_box->currentText(),"%s%s%d",
-	 station,gunk,&chan);
-  QString sql=
-    QString().sprintf("select RECORDINGS.START_TIME,CUTS.LENGTH\
-                       from RECORDINGS left join CUTS\
-                       on(RECORDINGS.CUT_NAME=CUTS.CUT_NAME)\
-                       where (RECORDINGS.STATION_NAME=\"%s\")&&\
-                       (RECORDINGS.TYPE=%d)&&(RECORDINGS.CHANNEL=%d)",
-		      station,RDRecording::Playout,chan+128);
-  if(edit_sun_button->isChecked()) {
-    sql+="&&(RECORDINGS.SUN=\"Y\")";
-  }
-  if(edit_mon_button->isChecked()) {
-    sql+="&&(RECORDINGS.MON=\"Y\")";
-  }
-  if(edit_tue_button->isChecked()) {
-    sql+="&&(RECORDINGS.TUE=\"Y\")";
-  }
-  if(edit_wed_button->isChecked()) {
-    sql+="&&(RECORDINGS.WED=\"Y\")";
-  }
-  if(edit_thu_button->isChecked()) {
-    sql+="&&(RECORDINGS.THU=\"Y\")";
-  }
-  if(edit_fri_button->isChecked()) {
-    sql+="&&(RECORDINGS.FRI=\"Y\")";
-  }
-  if(edit_sat_button->isChecked()) {
-    sql+="&&(RECORDINGS.SAT=\"Y\")";
-  }
-  if(!include_myself) {
-    sql+=QString().sprintf("&&(RECORDINGS.ID!=%d)",edit_recording->id());
-  }
-  RDSqlQuery *q=new RDSqlQuery(sql);
-  while(q->next()) {
-    test_start_time=q->value(0).toTime();
-    test_end_time=q->value(0).toTime().addMSecs(q->value(1).toUInt());
-    if(test_end_time<test_start_time) {
-      test_end_time=QTime(23,59,59);
-    }
-    if(((start_time<test_start_time)&&(start_time<test_end_time)&&
-	(end_time<test_start_time)&&(end_time<test_end_time))||
-       ((start_time>test_start_time)&&(start_time>test_end_time)&&
-	(end_time>test_start_time)&&(end_time>test_end_time))) {
-    }
-    else {
-      delete q;
-      return false;
-    }
-  }
-  delete q;
-
-  return true;
-}
--- a/rdcatch/edit_playout.h
+++ b/rdcatch/edit_playout.h
@ -59,7 +59,6 @@ class EditPlayout : public QDialog
 private:
  void PopulateDecks(QComboBox *box);
  void Save();
-  bool CheckEvent(bool include_myself);
  RDDeck *edit_deck;
  RDRecording *edit_recording;
  QCheckBox *edit_active_button;
--- a/rdcatch/rdcatch_cs.ts
+++ b/rdcatch/rdcatch_cs.ts
@ -432,11 +432,11 @@ nové</translation>
    </message>
    <message>
        <source>Duplicate Event</source>
-        <translation>Zdvojená událost</translation>
+        <translation type="obsolete">Zdvojená událost</translation>
    </message>
    <message>
        <source>An event with these parameters already exists!</source>
-        <translation>Událost s těmito parametry již existuje!</translation>
+        <translation type="obsolete">Událost s těmito parametry již existuje!</translation>
    </message>
 </context>
 <context>
--- a/rdcatch/rdcatch_de.ts
+++ b/rdcatch/rdcatch_de.ts
@ -432,11 +432,11 @@ Neu</translation>
    </message>
    <message>
        <source>Duplicate Event</source>
-        <translation>Doppeltes Event</translation>
+        <translation type="obsolete">Doppeltes Event</translation>
    </message>
    <message>
        <source>An event with these parameters already exists!</source>
-        <translation>Ein Event mit diesen Parametern existiert bereits!</translation>
+        <translation type="obsolete">Ein Event mit diesen Parametern existiert bereits!</translation>
    </message>
 </context>
 <context>
--- a/rdcatch/rdcatch_es.ts
+++ b/rdcatch/rdcatch_es.ts
@ -426,11 +426,11 @@ como Nuevo</translation>
    </message>
    <message>
        <source>Duplicate Event</source>
-        <translation>Evento duplicado</translation>
+        <translation type="obsolete">Evento duplicado</translation>
    </message>
    <message>
        <source>An event with these parameters already exists!</source>
-        <translation>¡Un evento con esos parámetros ya existe!</translation>
+        <translation type="obsolete">¡Un evento con esos parámetros ya existe!</translation>
    </message>
    <message>
        <source>&amp;Save As
--- a/rdcatch/rdcatch_fr.ts
+++ b/rdcatch/rdcatch_fr.ts
@ -427,14 +427,6 @@ New</source>
        <source>&amp;Cancel</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Duplicate Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>An event with these parameters already exists!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>EditRecording</name>
--- a/rdcatch/rdcatch_nb.ts
+++ b/rdcatch/rdcatch_nb.ts
@ -429,11 +429,11 @@ New</source>
    </message>
    <message>
        <source>Duplicate Event</source>
-        <translation>Kopier hending</translation>
+        <translation type="obsolete">Kopier hending</translation>
    </message>
    <message>
        <source>An event with these parameters already exists!</source>
-        <translation>Det finst alt ei hending med dette oppsettet!</translation>
+        <translation type="obsolete">Det finst alt ei hending med dette oppsettet!</translation>
    </message>
 </context>
 <context>
--- a/rdcatch/rdcatch_nn.ts
+++ b/rdcatch/rdcatch_nn.ts
@ -429,11 +429,11 @@ New</source>
    </message>
    <message>
        <source>Duplicate Event</source>
-        <translation>Kopier hending</translation>
+        <translation type="obsolete">Kopier hending</translation>
    </message>
    <message>
        <source>An event with these parameters already exists!</source>
-        <translation>Det finst alt ei hending med dette oppsettet!</translation>
+        <translation type="obsolete">Det finst alt ei hending med dette oppsettet!</translation>
    </message>
 </context>
 <context>
--- a/rdcatch/rdcatch_pt_BR.ts
+++ b/rdcatch/rdcatch_pt_BR.ts
@ -432,11 +432,11 @@ Novo</translation>
    </message>
    <message>
        <source>Duplicate Event</source>
-        <translation>Duplicar Evento</translation>
+        <translation type="obsolete">Duplicar Evento</translation>
    </message>
    <message>
        <source>An event with these parameters already exists!</source>
-        <translation>Um Evento com estes parâmetros já existe!</translation>
+        <translation type="obsolete">Um Evento com estes parâmetros já existe!</translation>
    </message>
 </context>
 <context>