v1.34.5.0

- PrimaryDB tag bevezetése

v1.34.5.0
- PrimaryDB tag bevezetése
Schwirg László
1 parent 718b801e
Showing 2 changed files with 14 additions and 21 deletions Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
@@ -2956,18 +2956,20 @@ GO
 			Xml_BackupFileNameMask = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.BackupFileNameMask), sqldatabasexml, common.Xml_BackupFileNameMask);
 			Xml_RestoreFileNameMask = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.RestoreFileNameMask), sqldatabasexml, common.Xml_RestoreFileNameMask);
 			Xml_BackupTargetDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.BackupTargetDirectoryPath), sqldatabasexml, common.Xml_BackupTargetDirectoryPath);
-			Xml_PrimaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.TranzitDirectoryNetworkPath), sqldatabasexml, common.Xml_PrimaryDB_TranzitDirectoryPath);
-			Xml_PrimaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.Server), sqldatabasexml, XmlStructure.SQLDataBase.Attributes.Server.Values.DEFAULT);
-			Xml_PrimaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.SQLConnectionString), sqldatabasexml, XmlStructure.SQLDataBase.Attributes.SQLConnectionString.Values.DEFAULT);
+
+			var pridbxml = GetXElement(sqldatabasexml,nameof(XmlStructure.SQLDataBase.PrimaryDB));if (pridbxml == null) { pridbxml = sqldatabasexml; }
+            Xml_PrimaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.Server), pridbxml, XmlStructure.SQLDataBase.Attributes.Server.Values.DEFAULT);
+			Xml_PrimaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.SQLConnectionString), pridbxml, XmlStructure.SQLDataBase.Attributes.SQLConnectionString.Values.DEFAULT);
+			Xml_PrimaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.TranzitDirectoryNetworkPath), pridbxml, common.Xml_PrimaryDB_TranzitDirectoryPath);
+			Xml_PrimaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.PhysicalFilesDirectoryPath), pridbxml, common.Xml_PrimaryDB_PhysicalFilesDirectoryPath);
 			var secdbxml = GetXElement(sqldatabasexml,nameof(XmlStructure.SQLDataBase.SecondaryDB));
-			Xml_SecondaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.Server), secdbxml, "");
-			Xml_SecondaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.SQLConnectionString), secdbxml, "");
-            Xml_SecondaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.TranzitDirectoryNetworkPath), secdbxml, "");
-            Xml_SecondaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.SecondaryDB.Attributes.PhysicalFilesDirectoryPath), secdbxml, "");
+			Xml_SecondaryDB_ServerName = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.Server), secdbxml, "");
+			Xml_SecondaryDB_SQLConnectionString = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.SQLConnectionString), secdbxml, "");
+            Xml_SecondaryDB_TranzitDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.TranzitDirectoryNetworkPath), secdbxml, "");
+            Xml_SecondaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.PhysicalFilesDirectoryPath), secdbxml, "");
             Xml_CreateZip = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.CreateZip), sqldatabasexml, common.Xml_CreateZip);
-			Xml_PrimaryDB_PhysicalFilesDirectoryPath = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.PhysicalFilesDirectoryPath), sqldatabasexml, common.Xml_PrimaryDB_PhysicalFilesDirectoryPath);
 			Xml_ScriptCommandTimeout = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.ScriptCommandTimeout), sqldatabasexml, common.Xml_ScriptCommandTimeout);
 			Xml_BackupTimeout = GetValue(nameof(XmlStructure.SQLDataBase.Attributes.BackupTimeout), sqldatabasexml, common.Xml_BackupTimeout);
@@ -3111,17 +3113,8 @@ GO
                         }
                     }
 				}
-                public static class SecondaryDB
-                {
-                    public static class Attributes
-                    {
-                        public static class TranzitDirectoryLocalPath { public static class Values { public const string DEFAULT = ""; } }
-                        public static class TranzitDirectoryNetworkPath { public static class Values { public const string DEFAULT = ""; } }
-                        public static class PhysicalFilesDirectoryPath { public static class Values { public const string DEFAULT = ""; } }
-                        public static class SQLConnectionString { public static class Values { public const string DEFAULT = null; } }
-                        public static class Server { public static class Values { public const string DEFAULT = null; } }
-                    }
-                }
+				public static class PrimaryDB { }
+                public static class SecondaryDB { }
             }
         }
 		#endregion XmlStructure
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.34.4.0")]
-[assembly: AssemblyFileVersion("1.34.4.0")]
+[assembly: AssemblyVersion("1.34.5.0")]
+[assembly: AssemblyFileVersion("1.34.5.0")]