From f450c7581ae99cb0c625e39d42b16a7f1a08b207 Mon Sep 17 00:00:00 2001
From: Schwirg László <lschwirg@vonalkod.hu>
Date: Thu, 19 Dec 2024 06:47:53 +0100
Subject: [PATCH] v1.31.2.0 - Multirun script paraméterek között a DAYSBACK és a LIMITDATE összeolvasztása

---
 Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs | 87 +++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs      |  4 ++--
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs b/Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
index be1aeb7..1759744 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
@@ -1942,43 +1942,44 @@ GO
 		{
 			DBKEY,DATABASE,DATASOURCE,DBOTYPE,DBONAME,DBDATAGROUP,BACKUPTS,SHRINKOPTION,SHRINKFREESPACEPERCENT,
 		}
-		#endregion DBSubstitution
+        #endregion DBSubstitution
 
-		#region ExecuteSQLScriptWithMultipleRuns
-		/// <summary>
-		/// Executes a multirun script. Its parameters are in the <Script Parameters=> attribute, as list of KEY=VALUE; pairs.
-		/// Keys:
-		///		DAYSBACK (C# int value) or LIMITDATE (C# DateTime value): how many days from now, or from when the older rows should be deleted
-		///		NUMOFDAYSINONERUN (C# int value): how many days are deleted in one run 
-		///		DELAYBETWEENRUNS (C# TimeSpan value): how much delay will be between runs 
-		///		TESTMODE (C# bool value): if testmode, no delete takes place
-		/// </summary>
-		/// <param name="sqlc">connectionstring az sql server-hez</param>
-		/// <param name="sqlscript">az sql script (multirun interfész szerint!!!)
-		///		this should be used in the script in the following way:
-		///		DECLARE @RUNNINGMODE AS varchar(20) = '{RUNNINGMODE}'
-		///		IF @RUNNINGMODE = 'GETTOTALRECORDS'
-		///		THEN
-		///			-- this part of the script should count the number of the rows of the dab, that will decrease after each run
-		///			SELECT @RV, @RM -- @RV:0, @RM:the number of rows
-		///		END
-		///		ELSE IF @RUNNINGMODE = 'GETMINDATE'
-		///		THEN
-		///			-- this part of the script should return a DateTime value, that is the oldest date in the database
-		///			SELECT @RV, @RM -- @RV:0, @RM:the Date, that is considered the oldest; no rows will be deleted before this
-		///		END
-		///		ELSE IF @RUNNINGMODE = 'ONERUN'
-		///		THEN
-		///			-- this part of the script deletes some rows from the database, older then a limitdate(parameter)
-		///			-- parameter usage: DECLARE @RUNDELETEBEFOREDATE AS DATE = '{RUNDELETEBEFOREDATE}'
-		///			SELECT @RV, @RM -- @RV:(0=OK, otherwise NOK), @RM:message with the result description
-		///		END
-		/// </param>
-		/// <param name="ExitAtThisPoint">az a függvény, ami minde run után végrehajtásra kerül; 
-		///		bemenő paramétere az előző run eredménye, 
-		///		kimenő paramétere pedig igaz, ha ki kell lépni a végrehajtásból.
-		/// </param>
-		/// <returns></returns>
+        #region ExecuteSQLScriptWithMultipleRuns
+        /// <summary>
+        /// Executes a multirun script. Its parameters are in the <Script Parameters=> attribute, as list of KEY=VALUE; pairs.
+        /// Keys:
+        ///		LIMITDATE yyyy-MM-dd hh:mm:ss (yyyy-MM-dd hh:mm:ss is C# DateTime value) from when the older rows should be deleted (LIMITDATE 2024-12-31)
+		///		LIMITDATE NNdays (NN is C# int value): how many days from now the older rows should be deleted (LIMITDATE 90days)
+        ///		NUMOFDAYSINONERUN (C# int value): how many days are deleted in one run 
+        ///		DELAYBETWEENRUNS (C# TimeSpan value): how much delay will be between runs 
+        ///		TESTMODE (C# bool value): if testmode, no delete takes place
+        /// </summary>
+        /// <param name="sqlc">connectionstring az sql server-hez</param>
+        /// <param name="sqlscript">az sql script (multirun interfész szerint!!!)
+        ///		this should be used in the script in the following way:
+        ///		DECLARE @RUNNINGMODE AS varchar(20) = '{RUNNINGMODE}'
+        ///		IF @RUNNINGMODE = 'GETTOTALRECORDS'
+        ///		THEN
+        ///			-- this part of the script should count the number of the rows of the dab, that will decrease after each run
+        ///			SELECT @RV, @RM -- @RV:0, @RM:the number of rows
+        ///		END
+        ///		ELSE IF @RUNNINGMODE = 'GETMINDATE'
+        ///		THEN
+        ///			-- this part of the script should return a DateTime value, that is the oldest date in the database
+        ///			SELECT @RV, @RM -- @RV:0, @RM:the Date, that is considered the oldest; no rows will be deleted before this
+        ///		END
+        ///		ELSE IF @RUNNINGMODE = 'ONERUN'
+        ///		THEN
+        ///			-- this part of the script deletes some rows from the database, older then a limitdate(parameter)
+        ///			-- parameter usage: DECLARE @RUNDELETEBEFOREDATE AS DATE = '{RUNDELETEBEFOREDATE}'
+        ///			SELECT @RV, @RM -- @RV:(0=OK, otherwise NOK), @RM:message with the result description
+        ///		END
+        /// </param>
+        /// <param name="ExitAtThisPoint">az a függvény, ami minde run után végrehajtásra kerül; 
+        ///		bemenő paramétere az előző run eredménye, 
+        ///		kimenő paramétere pedig igaz, ha ki kell lépni a végrehajtásból.
+        /// </param>
+        /// <returns></returns>
 
         public static ReturnInfoJSON ExecuteMultirunSQLScript(SqlConnection sqlc, SQLDataBase.SQLScript sqlscript, Func<ReturnInfoJSON,TimeSpan?, bool> ExitAtThisPoint=null)
         {
@@ -2086,18 +2087,17 @@ GO
             var testmodestring = argkvplist.GetValue(XMLPAR_TESTMODE, "false");
             if (!bool.TryParse(testmodestring, out par_testmode)) { Add(multirunresult, "Result", $"Parameter error:{XMLPAR_TESTMODE}"); return null; }
 
-            var daysbackstring = argkvplist.GetValue(XMLPAR_DAYSBACK, null);
-            var limitdatestring = argkvplist.GetValue(XMLPAR_LIMITDATE, null);
-			if (daysbackstring == null && limitdatestring == null) { par_limitdays = 90; par_limitdate = DateTime.Now.Subtract(new TimeSpan(par_limitdays, 0, 0, 0)); }
-			else if (!string.IsNullOrEmpty(daysbackstring) && !string.IsNullOrEmpty(limitdatestring)) { Add(multirunresult, "Result", $"Parameter error:{XMLPAR_DAYSBACK} and {XMLPAR_LIMITDATE} are both defined."); return null; }
-			else if (!string.IsNullOrEmpty(limitdatestring))
+			string limitdatestring = argkvplist.GetValue(XMLPAR_LIMITDATE, null); string daysbackstring = null;
+            if (limitdatestring == null) { limitdatestring="90days"; }
+            if (limitdatestring.EndsWith("days")) { daysbackstring = limitdatestring.Replace("days", "").Replace(" ", ""); limitdatestring = null; }
+			if (!string.IsNullOrEmpty(limitdatestring))
 			{
-				if (!DateTime.TryParse(limitdatestring, out par_limitdate)) { Add(multirunresult, "Result", $"Parameter error:" + XMLPAR_LIMITDATE); return null; }
+				if (!DateTime.TryParse(limitdatestring, out par_limitdate)) { Add(multirunresult, "Result", $"Parameter error:{XMLPAR_LIMITDATE}"); return null; }
 				par_limitdays = (int)DateTime.Now.Subtract(par_limitdate).TotalDays;
 			}
 			else /*if (!string.IsNullOrEmpty(daysbackstring)) */
 			{
-				if (!int.TryParse(daysbackstring, out par_limitdays)) { Add(multirunresult, "Result", $"Parameter error:" + XMLPAR_DAYSBACK); return null; }
+				if (!int.TryParse(daysbackstring, out par_limitdays)) { Add(multirunresult, "Result", $"Parameter error:{XMLPAR_LIMITDATE}(days)"); return null; }
                 par_limitdate = DateTime.Now.Subtract(new TimeSpan(par_limitdays, 0, 0, 0));
             }
 
@@ -2138,7 +2138,6 @@ GO
         const string XMLPAR_NUMOFDAYSINONERUN = "NUMOFDAYSINONERUN";
         const string XMLPAR_DELAYBETWEENRUNS = "DELAYBETWEENRUNS";
         const string XMLPAR_TESTMODE = "TESTMODE";
-        const string XMLPAR_DAYSBACK = "DAYSBACK";
         const string XMLPAR_LIMITDATE = "LIMITDATE";
 
         const string ERRMSG_NOTHINGTOEXECUTE = "FAILURE! Nothing to execute! Check script definition entry!";
diff --git a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
index d5bd798..29842f6 100644
--- a/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
+++ b/Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
@@ -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.31.1.0")]
-[assembly: AssemblyFileVersion("1.31.1.0")]
+[assembly: AssemblyVersion("1.31.2.0")]
+[assembly: AssemblyFileVersion("1.31.2.0")]
--
libgit2 0.21.2