From 3682d73e45eaccdb622645beab15825e3f1b85ef Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 9 Oct 2020 13:54:51 +0200
Subject: [PATCH] Update processo avvio sessioni

---
 IOB-WIN/DATA/CONF/EM63.json |  8 ++++----
 IOB-WIN/IobFileEurom63.cs   | 24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/IOB-WIN/DATA/CONF/EM63.json b/IOB-WIN/DATA/CONF/EM63.json
index fc33289f..04b762c6 100644
--- a/IOB-WIN/DATA/CONF/EM63.json
+++ b/IOB-WIN/DATA/CONF/EM63.json
@@ -30,7 +30,7 @@
             "Cycle": false,
             "Description": "Check Connection Status",
             "Max2Keep": 10,
-            "RetrySec": 30,
+            "RetrySec": 20,
             "SessionName": "SESS0000",
             "SessionType": "IsConnected",
             "StepOrder": 0,
@@ -46,7 +46,7 @@
             "Cycle": false,
             "Description": "Get ID data",
             "Max2Keep": 10,
-            "RetrySec": 30,
+            "RetrySec": 20,
             "SessionName": "SESS0001",
             "SessionType": "GetId",
             "StepOrder": 1,
@@ -65,7 +65,7 @@
         "2": {
             "Cycle": false,
             "Description": "Set DateTime on machine at start",
-            "RetrySec": 30,
+            "RetrySec": 20,
             "SessionName": "SESS0002",
             "SessionType": "SetDateTime",
             "ValidityMinutes": 0.0,
@@ -85,7 +85,7 @@
         "3": {
             "Cycle": false,
             "Description": "Abort All prev requests",
-            "RetrySec": 30,
+            "RetrySec": 20,
             "SessionName": "SESS0003",
             "SessionType": "AbortAll",
             "ValidityMinutes": 0.0,
diff --git a/IOB-WIN/IobFileEurom63.cs b/IOB-WIN/IobFileEurom63.cs
index 676df71d..25b83221 100644
--- a/IOB-WIN/IobFileEurom63.cs
+++ b/IOB-WIN/IobFileEurom63.cs
@@ -103,6 +103,23 @@ namespace IOB_WIN
         /// </summary>
         /// <param name="session"></param>
         /// <returns></returns>
+        protected bool checkRequest(Eurom63.Session session)
+        {
+            bool answ = false;
+            string fileName = "";
+            if (session != null)
+            {
+                fileName = $"{BaseDir}\\{session.SessionName}.REQ";
+                answ = File.Exists(fileName);
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Verifica se ci sia una risposta POSITIVA
+        /// </summary>
+        /// <param name="session"></param>
+        /// <returns></returns>
         protected bool checkResp(Eurom63.Session session)
         {
             bool answ = false;
@@ -122,11 +139,6 @@ namespace IOB_WIN
                         rawData = textReader.ReadToEnd();
                     }
                     answ = rawData.Contains(session.RespOk);
-                    if (!answ)
-                    {
-                        // se NON ok faccio pulizia...
-                        cleanupSession(session);
-                    }
                 }
             }
             return answ;
@@ -212,7 +224,7 @@ namespace IOB_WIN
                     {
                         DateTime adesso = DateTime.Now;
                         // evito di richiedere SE non fosse già scaduta richiesta...
-                        if (adesso > connectSession.RetryVeto)
+                        if (adesso > connectSession.RetryVeto || !checkRequest(connectSession))
                         {
                             // pulisco eventuali risp vecchie
                             cleanupResp(connectSession.SessionName);