VRH / VRH.Log4Pro.MaintenanceConsole

Commit ebe63016705a5f8ab1133d130ce7c21c7420e27a

Authored by Schwirg László
1 parent 718b801e

v1.34.5.0 

- PrimaryDB tag bevezetése
Showing 2 changed files with 14 additions and 21 deletions   Show diff stats
Inline Side-by-side
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
  Show/Hide comments   View file @ebe6301
... ... @@ -2956,18 +2956,20 @@ GO
2956 2956 Xml_BackupFileNameMask = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.BackupFileNameMask), sqldatabasexml, common.Xml_BackupFileNameMask);
2957 2957 Xml_RestoreFileNameMask = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.RestoreFileNameMask), sqldatabasexml, common.Xml_RestoreFileNameMask);
2958 2958 Xml_BackupTargetDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.BackupTargetDirectoryPath), sqldatabasexml, common.Xml_BackupTargetDirectoryPath);
2959   - Xml_PrimaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.TranzitDirectoryNetworkPath), sqldatabasexml, common.Xml_PrimaryDB_TranzitDirectoryPath);
2960   - Xml_PrimaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.Server), sqldatabasexml, XmlStructure.SQLDataBase.Attributes.Server.Values.DEFAULT);
2961   - Xml_PrimaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.SQLConnectionString), sqldatabasexml, XmlStructure.SQLDataBase.Attributes.SQLConnectionString.Values.DEFAULT);
  2959 +
  2960 + var pridbxml = GetXElement(sqldatabasexml,nameof(XmlStructure.SQLDataBase.PrimaryDB));if (pridbxml == null) { pridbxml = sqldatabasexml; }
  2961 + Xml_PrimaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.Server), pridbxml, XmlStructure.SQLDataBase.Attributes.Server.Values.DEFAULT);
  2962 + Xml_PrimaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.SQLConnectionString), pridbxml, XmlStructure.SQLDataBase.Attributes.SQLConnectionString.Values.DEFAULT);
  2963 + Xml_PrimaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.TranzitDirectoryNetworkPath), pridbxml, common.Xml_PrimaryDB_TranzitDirectoryPath);
  2964 + Xml_PrimaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.PhysicalFilesDirectoryPath), pridbxml, common.Xml_PrimaryDB_PhysicalFilesDirectoryPath);
2962 2965  
2963 2966 var secdbxml = GetXElement(sqldatabasexml,nameof(XmlStructure.SQLDataBase.SecondaryDB));
2964   - Xml_SecondaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.Server), secdbxml, "");
2965   - Xml_SecondaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.SQLConnectionString), secdbxml, "");
2966   - Xml_SecondaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.TranzitDirectoryNetworkPath), secdbxml, "");
2967   - Xml_SecondaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.PhysicalFilesDirectoryPath), secdbxml, "");
  2967 + Xml_SecondaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.Server), secdbxml, "");
  2968 + Xml_SecondaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.SQLConnectionString), secdbxml, "");
  2969 + Xml_SecondaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.TranzitDirectoryNetworkPath), secdbxml, "");
  2970 + Xml_SecondaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.PhysicalFilesDirectoryPath), secdbxml, "");
2968 2971  
2969 2972 Xml_CreateZip = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.CreateZip), sqldatabasexml, common.Xml_CreateZip);
2970   - Xml_PrimaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.PhysicalFilesDirectoryPath), sqldatabasexml, common.Xml_PrimaryDB_PhysicalFilesDirectoryPath);
2971 2973  
2972 2974 Xml_ScriptCommandTimeout = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.ScriptCommandTimeout), sqldatabasexml, common.Xml_ScriptCommandTimeout);
2973 2975 Xml_BackupTimeout = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.BackupTimeout), sqldatabasexml, common.Xml_BackupTimeout);
... ... @@ -3111,17 +3113,8 @@ GO
3111 3113 }
3112 3114 }
3113 3115 }
3114   - public static class SecondaryDB
3115   - {
3116   - public static class Attributes
3117   - {
3118   - public static class TranzitDirectoryLocalPath { public static class Values { public const string DEFAULT = ""; } }
3119   - public static class TranzitDirectoryNetworkPath { public static class Values { public const string DEFAULT = ""; } }
3120   - public static class PhysicalFilesDirectoryPath { public static class Values { public const string DEFAULT = ""; } }
3121   - public static class SQLConnectionString { public static class Values { public const string DEFAULT = null; } }
3122   - public static class Server { public static class Values { public const string DEFAULT = null; } }
3123   - }
3124   - }
  3116 + public static class PrimaryDB { }
  3117 + public static class SecondaryDB { }
3125 3118 }
3126 3119 }
3127 3120 #endregion XmlStructure
... ...
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
  Show/Hide comments   View file @ebe6301
... ... @@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
32 32 // You can specify all the values or you can default the Build and Revision Numbers
33 33 // by using the '*' as shown below:
34 34 // [assembly: AssemblyVersion("1.0.*")]
35   -[assembly: AssemblyVersion("1.34.4.0")]
36   -[assembly: AssemblyFileVersion("1.34.4.0")]
  35 +[assembly: AssemblyVersion("1.34.5.0")]
  36 +[assembly: AssemblyFileVersion("1.34.5.0")]
... ...