From b4fbe7c07c7fa0b49d9fd5cb911dfc4aa0725584 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 25 Nov 2020 16:35:02 +0100
Subject: [PATCH 1/2] update comportamento verifica split ODL

---
 IOB-WIN/AdapterForm.cs      | 4 +---
 IOB-WIN/IobConfiguration.cs | 2 +-
 IOB-WIN/IobGeneric.cs       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index 16d3ea30..86197242 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -16,7 +16,6 @@ namespace IOB_WIN
 {
     public partial class AdapterForm : Form
     {
-
         #region Protected Fields
 
         /// <summary>
@@ -1115,7 +1114,7 @@ namespace IOB_WIN
                 ,
                 slot = (short)fIni.ReadInteger("CNC", "SLOT", 0)
                 ,
-                serverData = new serverMapo(fIni.ReadString("SERVER", "MPIP", "::1"), fIni.ReadString("SERVER", "MPURL", "/"), fIni.ReadString("SERVER", "CMDBASE", "/"), fIni.ReadString("SERVER", "CMDFLOG", "/"), fIni.ReadString("SERVER", "CMDALIVE", "/"), fIni.ReadString("SERVER", "CMDENABLED", "/"), fIni.ReadString("SERVER", "CMDREBO", "/"), fIni.ReadString("SERVER", "CMD_ODL_STARTED", "/IOB/getCurrOdlStart/"), fIni.ReadString("SERVER", "CLI_INST", "SW_CLI"))
+                serverData = new serverMapo(fIni.ReadString("SERVER", "MPIP", "::1"), fIni.ReadString("SERVER", "MPURL", "/"), fIni.ReadString("SERVER", "CMDBASE", "/"), fIni.ReadString("SERVER", "CMDFLOG", "/"), fIni.ReadString("SERVER", "CMDALIVE", "/"), fIni.ReadString("SERVER", "CMDENABLED", "/"), fIni.ReadString("SERVER", "CMDREBO", "/"), fIni.ReadString("SERVER", "CMD_ODL_STARTED", "/IOB/getCurrOdlStart/"), fIni.ReadString("SERVER", "CLI_INST", "SW_CLI"), fIni.ReadString("SERVER", "CMD_FORCLE_SPLIT_ODL", "/IOB/forceSplitOdlFull/"))
                 ,
                 MAX_COUNTER_BLINK = Convert.ToInt32(fIni.ReadString("BLINK", "MAX_COUNTER_BLINK", "1"))
                 ,
@@ -1798,6 +1797,5 @@ namespace IOB_WIN
         }
 
         #endregion Public Methods
-
     }
 }
\ No newline at end of file
diff --git a/IOB-WIN/IobConfiguration.cs b/IOB-WIN/IobConfiguration.cs
index 3ce13940..b2bcd469 100644
--- a/IOB-WIN/IobConfiguration.cs
+++ b/IOB-WIN/IobConfiguration.cs
@@ -146,7 +146,7 @@ namespace IOB_WIN
         /// <param name="CMDREBO_">Comando x reboot</param>
         /// <param name="CMD_ODL_STARTED_">Comando x check data avvio ODL</param>
         /// <param name="CMD_FORCLE_SPLIT_ODL_">Comando x forzare split ODL</param>
-        public serverMapo(string MPIP_, string MPURL_ = "/MP/IO", string CMDBASE_ = "/IOB/input/", string CMDFLOG_ = "/IOB/flog/", string CMDALIVE_ = "IOB", string CMDENABLED_ = "/IOB/enabled/", string CMDREBO_ = "/sendReboot.aspx?idxMacchina=", string CMD_ODL_STARTED_ = "/IOB/getCurrOdlStart/", string CLI_INST_ = "SteamWare", string CMD_FORCLE_SPLIT_ODL_ = "/IOB/forceSplitOdl/", string CMD_IDLE_TIME_ = "/IOB/getIdlePeriod/")
+        public serverMapo(string MPIP_, string MPURL_ = "/MP/IO", string CMDBASE_ = "/IOB/input/", string CMDFLOG_ = "/IOB/flog/", string CMDALIVE_ = "IOB", string CMDENABLED_ = "/IOB/enabled/", string CMDREBO_ = "/sendReboot.aspx?idxMacchina=", string CMD_ODL_STARTED_ = "/IOB/getCurrOdlStart/", string CLI_INST_ = "SteamWare", string CMD_FORCLE_SPLIT_ODL_ = "/IOB/forceSplitOdlFull/", string CMD_IDLE_TIME_ = "/IOB/getIdlePeriod/")
         {
             if (!string.IsNullOrEmpty(MPIP_))
             {
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index 10accb3a..3c70db86 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -3049,7 +3049,7 @@ namespace IOB_WIN
                         {
                             // invio chiamata URL x reset ODL su macchina
                             rawSplit = callUrl(urlForceSplit, false);
-                            fatto = (rawSplit == "OK") ? true : false;
+                            fatto = (rawSplit != "KO") ? true : false;
                         }
                         // se multi gestisco il bit delle tavole...
                         else

From c08e0a783d42cda389ee0d2f1b49b103df1c40d5 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 25 Nov 2020 16:35:14 +0100
Subject: [PATCH 2/2] update vers 750

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 77f7ce17..1b98cbf7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=749']) {
+        withEnv(['NEXT_BUILD_NUMBER=750']) {
           // env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'