Changed: latest text parser.

yagasoft · Dec 11, 2023 · 95680b6 · 95680b6
1 parent 395c17c
commit 95680b6
Show file tree

Hide file tree

Showing 6 changed files with 2,170 additions and 3,097 deletions.
diff --git a/Yagasoft.AutoNumbering.Plugins/BLL/AutoNumberingEngine.cs b/Yagasoft.AutoNumbering.Plugins/BLL/AutoNumberingEngine.cs
@@ -4,18 +4,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Yagasoft.AutoNumbering.Plugins.Helpers;
-using Yagasoft.Libraries.Common;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Client;
+using Yagasoft.AutoNumbering.Plugins.Helpers;
+using Yagasoft.Libraries.Common;
 
 #endregion
 
 namespace Yagasoft.AutoNumbering.Plugins.BLL
 {
 	/// <summary>
 	///     Author: Ahmed Elsawalhy<br />
-	///     Version: 2.1.1
+	///     Version: 2.1.2
 	/// </summary>
 	[Log]
 	internal class AutoNumberingEngine
@@ -37,7 +37,7 @@ internal class Result
 		private readonly IEnumerable<string> inputParams;
 
 		private int padding;
-		
+
 		private readonly Guid orgId;
 		private readonly bool isUpdate;
 		private AutoNumbering updatedAutoNumbering;
@@ -370,7 +370,7 @@ internal string ParseParamVariables(int paramIndex)
 
 		private string ParseAttributeVariables(string rawString)
 		{
-			return CrmParser.Parse(rawString, image, service, this, orgId, typeof(Constructs));
+			return CrmParser.Interpreter.Parse(rawString, [typeof(Constructs)]).Evaluate(service, image, this);
 		}
 
 		private string ParseDateVariables(string rawString)
@@ -385,7 +385,7 @@ private string ParseDateVariables(string rawString)
 					}
 
 					var rawVariable = match.Groups[1].Value;
-					rawVariable = CrmParser.Parse(rawVariable, image, service, this, orgId, typeof(Constructs));
+					rawVariable = CrmParser.Interpreter.Parse(rawVariable, [typeof(Constructs)]).Evaluate(service, image, this);
 
 					var date = DateTime.UtcNow.ConvertToCrmUserTimeZone(service, autoNumberConfig.Owner.Id);
 					return string.Format("{0:" + rawVariable + "}", date);