v1.17.1.0

- message queue sending template can be an xml structure

v1.17.1.0
- message queue sending template can be an xml structure
Schwirg László
1 parent f732e5c9
Showing 2 changed files with 14 additions and 3 deletions Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - MSMQManager.cs
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
@@ -946,12 +946,23 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MSMQManagerNS
 		public List<string> Xml_QueueIdList;
 		public MSMQMessageTemplate(XElement messagetemplatexml)
 		{
-			Xml_TemplateString = GetValue(messagetemplatexml, "");
+			Xml_TemplateString = GetInnerText(messagetemplatexml,"");
 			if (string.IsNullOrWhiteSpace(Xml_TemplateString)) { isValid = false; return; }
 			Xml_QueueIdList = new List<string>();
 			var queueidlistcsvstring = GetValue(nameof(MSMQ.XmlStructure.MSMQManager.MessageTemplates.MessageTemplate.Attributes.QueueIdList), messagetemplatexml, MSMQ.XmlStructure.MSMQManager.MessageTemplates.MessageTemplate.Attributes.QueueIdList.Values.DEFAULT);
 			if (!string.IsNullOrWhiteSpace(queueidlistcsvstring)) Xml_QueueIdList = queueidlistcsvstring.Split(new char[] { ',', ';' },StringSplitOptions.RemoveEmptyEntries).ToList();
 		}
+		private string GetInnerText(XElement xe,string defaultvalue)
+		{
+			var node = xe?.FirstNode;if (node == null) return defaultvalue;
+			string xetxt = "";
+			while (node != null)
+			{
+				xetxt += node.ToString();
+				node = node.NextNode;
+			}
+			return xetxt;
+		}
 	}
 	public class MSMQDefaults : XmlLinqBase
 	{
@@ -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.17.0.0")]
-[assembly: AssemblyFileVersion("1.17.0.0")]
+[assembly: AssemblyVersion("1.17.1.0")]
+[assembly: AssemblyFileVersion("1.17.1.0")]