From 98957e1d6207aeed8edc6f8f0e95951fb7390c28 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Tue, 18 Oct 2022 16:08:47 -0400
Subject: [PATCH] 2022-10-18 Fred Gleason <fredg@paravelsystems.com> 	*
 Added values for the `IMPORTER_TEMPLATES.TRANS_TYPE_*` and 
 `TIMPORTER_TEMPLATES.TIME_TYPE_*` parser settings for the 	'Rivendell
 Standard Import' profile. 	* Incremented the database version to 364.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog                      |  5 +++++
 lib/dbversion.h                |  2 +-
 rdadmin/edit_svc.cpp           | 20 +++++++++++++++++---
 rdadmin/edit_svc.h             |  2 ++
 utils/rddbmgr/revertschema.cpp | 17 +++++++++++++++++
 utils/rddbmgr/schemamap.cpp    |  2 +-
 utils/rddbmgr/updateschema.cpp | 14 ++++++++++++++
 7 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c315ae4..37a29429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23528,3 +23528,8 @@
 	'SERVICES.MUS_TRANS_TYPE_LENGTH', 'SERVICES.MUS_TIME_TYPE_OFFSET'
 	and 'SERVICES.MUS_TIME_TYPE_LENGTH' fields when cloning a new
 	Service entry.
+2022-10-18 Fred Gleason <fredg@paravelsystems.com>
+	* Added values for the `IMPORTER_TEMPLATES.TRANS_TYPE_*` and
+	`TIMPORTER_TEMPLATES.TIME_TYPE_*` parser settings for the
+	'Rivendell Standard Import' profile.
+	* Incremented the database version to 364.
diff --git a/lib/dbversion.h b/lib/dbversion.h
index fca6e9b9..ee684420 100644
--- a/lib/dbversion.h
+++ b/lib/dbversion.h
@@ -24,7 +24,7 @@
 /*
  * Current Database Version
  */
-#define RD_VERSION_DATABASE 363
+#define RD_VERSION_DATABASE 364
 
 
 #endif  // DBVERSION_H
diff --git a/rdadmin/edit_svc.cpp b/rdadmin/edit_svc.cpp
index 3e001585..8a1de992 100644
--- a/rdadmin/edit_svc.cpp
+++ b/rdadmin/edit_svc.cpp
@@ -134,6 +134,8 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
   svc_bypass_box->insertItem(1,tr("Yes"));
   connect(svc_bypass_box,SIGNAL(activated(const QString &)),
 	  this,SLOT(textChangedData(const QString &)));
+  connect(svc_bypass_box,SIGNAL(activated(int)),
+	  this,SLOT(bypassModeChangedData(int)));
   label=new QLabel(tr("Bypass Grid Processing")+":",this);
   label->setGeometry(10,136,170,19);
   label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -149,9 +151,10 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
     insertItem((int)RDSvc::SchedFile,tr("From Scheduler File"));
   connect(svc_sub_event_inheritance_box,SIGNAL(activated(const QString &)),
 	  this,SLOT(textChangedData(const QString &)));
-  label=new QLabel(tr("Inline Event Start/Length")+":",this);
-  label->setGeometry(10,157,170,19);
-  label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+  svc_sub_event_inheritance_label=
+    new QLabel(tr("Inline Event Start/Length")+":",this);
+  svc_sub_event_inheritance_label->setGeometry(10,157,170,19);
+  svc_sub_event_inheritance_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
   //
   // Voicetracking Group
@@ -580,6 +583,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent)
     setText(svc_svc->trackString(RDSvc::Music));
   tfcTemplateActivatedData(svc_tfc_import_template_box->currentIndex());
   musTemplateActivatedData(svc_mus_import_template_box->currentIndex());
+  bypassModeChangedData(svc_bypass_box->currentIndex());
   import_changed=false;
 }
 
@@ -612,6 +616,16 @@ void EditSvc::autofillData()
 }
 
 
+void EditSvc::bypassModeChangedData(int n)
+{
+  if(n!=0) {
+    svc_sub_event_inheritance_box->setCurrentIndex((int)RDSvc::SchedFile);
+  }
+  svc_sub_event_inheritance_label->setEnabled(n==0);
+  svc_sub_event_inheritance_box->setEnabled(n==0);
+}
+
+
 void EditSvc::enableHostsData()
 {
   EditSvcPerms *edit_perms=new EditSvcPerms(svc_svc,this);
diff --git a/rdadmin/edit_svc.h b/rdadmin/edit_svc.h
index 7a35ea29..0b68f3d8 100644
--- a/rdadmin/edit_svc.h
+++ b/rdadmin/edit_svc.h
@@ -44,6 +44,7 @@ class EditSvc : public RDDialog
 
  private slots:
   void autofillData();
+  void bypassModeChangedData(int n);
   void enableHostsData();
   void trafficData();
   void trafficCopyData();
@@ -65,6 +66,7 @@ class EditSvc : public RDDialog
   QLineEdit *svc_name_template_edit;
   QLineEdit *svc_description_template_edit;
   QComboBox *svc_bypass_box;
+  QLabel *svc_sub_event_inheritance_label;
   QComboBox *svc_sub_event_inheritance_box;
   QComboBox *svc_voice_group_box;
   QComboBox *svc_autospot_group_box;
diff --git a/utils/rddbmgr/revertschema.cpp b/utils/rddbmgr/revertschema.cpp
index a876852c..d9a07fdd 100644
--- a/utils/rddbmgr/revertschema.cpp
+++ b/utils/rddbmgr/revertschema.cpp
@@ -41,6 +41,23 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg)
   // NEW SCHEMA REVERSIONS GO HERE...
 
 
+  //
+  // Revert 364
+  //
+  if((cur_schema==364)&&(set_schema<cur_schema)) {
+    sql=QString("update `IMPORT_TEMPLATES` set ")+
+      "`TRANS_TYPE_OFFSET`=NULL,"+
+      "`TRANS_TYPE_LENGTH`=NULL,"+
+      "`TIME_TYPE_OFFSET`=NULL,"+
+      "`TIME_TYPE_LENGTH`=NULL "+
+      "where `NAME`='Rivendell Standard Import'";
+    if(!RDSqlQuery::apply(sql,err_msg)) {
+      return false;
+    }
+
+    WriteSchemaVersion(--cur_schema);
+  }
+
   //
   // Revert 363
   //
diff --git a/utils/rddbmgr/schemamap.cpp b/utils/rddbmgr/schemamap.cpp
index 26066251..ee5012e4 100644
--- a/utils/rddbmgr/schemamap.cpp
+++ b/utils/rddbmgr/schemamap.cpp
@@ -160,7 +160,7 @@ void MainObject::InitializeSchemaMap() {
   global_version_map["3.4"]=317;
   global_version_map["3.5"]=346;
   global_version_map["3.6"]=347;
-  global_version_map["4.0"]=363;
+  global_version_map["4.0"]=364;
 }
 
 
diff --git a/utils/rddbmgr/updateschema.cpp b/utils/rddbmgr/updateschema.cpp
index 8f128e90..72262f96 100644
--- a/utils/rddbmgr/updateschema.cpp
+++ b/utils/rddbmgr/updateschema.cpp
@@ -11265,6 +11265,20 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
     WriteSchemaVersion(++cur_schema);
   }
 
+  if((cur_schema<364)&&(set_schema>cur_schema)) {
+    sql=QString("update `IMPORT_TEMPLATES` set ")+
+      "`TRANS_TYPE_OFFSET`=102,"+
+      "`TRANS_TYPE_LENGTH`=5,"+
+      "`TIME_TYPE_OFFSET`=108,"+
+      "`TIME_TYPE_LENGTH`=4 "+
+      "where `NAME`='Rivendell Standard Import'";
+    if(!RDSqlQuery::apply(sql,err_msg)) {
+      return false;
+    }
+
+    WriteSchemaVersion(++cur_schema);
+  }
+
 
 
   // NEW SCHEMA UPDATES GO HERE...