Merge branch 'release/FixDWrap'

Fix per permettere scrittura valore vuoto su REDIS

Jenkinsfile

@@ -7,13 +7,10 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=759']) {
+        env.versionNumber = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
-          // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
+        env.versionNumberBeta = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
-          env.versionNumber = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
-          env.versionNumberBeta = VersionNumber(versionNumberString : '5.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
         env.APP_NAME = 'SteamWareLib'
       }				
-      }				
       script {
         currentBuild.displayName = "${env.versionNumber}"
         currentBuild.description = "BUILD ${env.versionNumber}"

SteamWare.IO/memLayer.cs

@@ -1950,16 +1950,8 @@ namespace SteamWare.IO
         /// </summary>
         public void resetAppConf()
         {
-            // controlo chiave x evitare doppio reset
-            if (!string.IsNullOrEmpty(getRSV(CleaningKey)))
-            {
-                //imposto veto 10 sec
-                setRSV(CleaningKey, DateTime.Now.ToString(), 10);
             redDelKey(ACBH);
             startupAppConf();
-                // veto 1 sec --> se ne va subito
-                setRSV(CleaningKey, "", 1);
-            }
         }
 
         /// <summary>
@@ -2152,6 +2144,8 @@ namespace SteamWare.IO
         public bool setRSV(string chiave, string valore)
         {
             bool answ = false;
+            if (!string.IsNullOrEmpty(chiave))
+            {
                 try
                 {
                     cache.StringSet(chiave, valore);
@@ -2161,6 +2155,11 @@ namespace SteamWare.IO
                 {
                     Logging.Instance.Error(string.Format("Eccezzione in setRSV:{0}{1}", Environment.NewLine, exc));
                 }
+            }
+            else
+            {
+                Logging.Instance.Error("Errore: chiave non valida (vuota) in setRSV");
+            }
             return answ;
         }
 
@@ -2171,7 +2170,7 @@ namespace SteamWare.IO
         /// <param name="valore"></param>
         /// <param name="TTL_sec">in secondi</param>
         /// <returns></returns>
-        public bool setRSV(string chiave, string valore, int TTL_sec)
+        public bool setRSV(string chiave, string valore, int TTL_sec = 5)
         {
             bool answ = false;
             try

SteamWareLib/DataWrap.cs

@@ -8,12 +8,91 @@ namespace SteamWare
     /// </summary>
     public class DataWrap
     {
-    #region area protected
+        #region Public Fields
+
+        /// <summary>
+        /// classe singleton x la gestione dei tableadapters
+        /// </summary>
+        public static DataWrap DW = new DataWrap();
+
+        /// <summary>
+        /// oggetto vocabolario organizzato come dizionario con chiave lang#lemma e valore la traduzione
+        /// </summary>
+        public Dictionary<string, string> dictVocabolario;
+
+        /// <summary>
+        /// table adapter Devices utente
+        /// </summary>
+        public DS_devicesTableAdapters.AnagDevicesTableAdapter taAnagDev;
+
+        /// <summary>
+        /// tableAdapter CdC
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.CDCTableAdapter taCdc;
+
+        /// <summary>
+        /// tableAdapter diritti
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.DIRITTITableAdapter taDiritti;
+
+        /// <summary>
+        /// tableAdapter funzione
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.FUNZIONETableAdapter taFunzione;
+
+        /// <summary>
+        /// table adapter lingue
+        /// </summary>
+        public DataLayer_genericTableAdapters.LingueTableAdapter taLingue;
+
+        /// <summary>
+        /// table adapter versione anagrafica
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.LogUpdateDbTableAdapter taLogAna;
+
+        /// <summary>
+        /// table adapter versione vocabolario
+        /// </summary>
+        public DataLayer_genericTableAdapters.LogUpdateDbTableAdapter taLogVoc;
+
+        /// <summary>
+        /// tableAdapter permessi
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.PermessiTableAdapter taPermessi;
+
+        /// <summary>
+        /// tableAdapter permessi2funzione
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.Permessi2FunzioneTableAdapter taPermessi2Funzione;
+
+        /// <summary>
+        /// tableAdapter userData (user/pwd)
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.UserDataTableAdapter taUserData;
+
+        /// <summary>
+        /// tableAdapter userDataExt (user/pwd)
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.UserDataExtTableAdapter taUserDataExt;
+
+        /// <summary>
+        /// tableAdapter utenti
+        /// </summary>
+        public DataLayer_AnagGenTableAdapters.UTENTETableAdapter taUtente;
+
+        /// <summary>
+        /// table adapter vocabolario
+        /// </summary>
+        public DataLayer_genericTableAdapters.VocabolarioTableAdapter taVocabolario;
+
+        #endregion Public Fields
+
+        #region Public Constructors
 
         /// <summary>
         /// metodo protected di avvio della classe
         /// </summary>
-    protected DataWrap()
+        public DataWrap()
         {
             // inizializzo i table adapters
             avvioTableAdaptersBase();
@@ -23,6 +102,65 @@ namespace SteamWare
             setupVocabolario();
         }
 
+        #endregion Public Constructors
+
+        #region Public Properties
+
+        /// <summary>
+        /// elenco lingue ammesse da vocabolario...
+        /// </summary>
+        public DataLayer_generic.LingueDataTable lingue
+        {
+            get
+            {
+                return taLingue.GetData();
+            }
+        }
+
+        /// <summary>
+        /// restituisce conteggio numero record dell'oggetto vocabolario
+        /// </summary>
+        public int numRecVoc
+        {
+            get
+            {
+                int answ = 0;
+                try
+                {
+                    answ = dictVocabolario.Count;
+                }
+                catch
+                { }
+                return answ;
+            }
+        }
+
+        /// <summary>
+        /// Verifica se il vocabolario sia ok...
+        /// </summary>
+        public bool vocabolarioOk
+        {
+            get
+            {
+                bool answ = false;
+                try
+                {
+                    answ = (dictVocabolario != null);
+                    if (answ)
+                    {
+                        answ = dictVocabolario.Count > 0;
+                    }
+                }
+                catch
+                { }
+                return answ;
+            }
+        }
+
+        #endregion Public Properties
+
+        #region Protected Methods
+
         /// <summary>
         /// procedura di avvio dei tableAdapter
         /// </summary>
@@ -32,6 +170,7 @@ namespace SteamWare
             taVocabolario = new DataLayer_genericTableAdapters.VocabolarioTableAdapter();
             taLogVoc = new DataLayer_genericTableAdapters.LogUpdateDbTableAdapter();
         }
+
         /// <summary>
         /// procedura di avvio dei tableAdapter
         /// </summary>
@@ -48,6 +187,32 @@ namespace SteamWare
             taLogAna = new DataLayer_AnagGenTableAdapters.LogUpdateDbTableAdapter();
             taAnagDev = new DS_devicesTableAdapters.AnagDevicesTableAdapter();
         }
+
+        /// <summary>
+        /// prende l'oggetto tabVocabolario in ram e lo trasforma in dictionary
+        /// </summary>
+        /// <returns></returns>
+        protected Dictionary<string, string> ricaricaDictVocabolario()
+        {
+            // continuo
+            Dictionary<string, string> answ = new Dictionary<string, string>();
+            if (taVocabolario == null)
+            {
+                foreach (DataLayer_generic.VocabolarioRow riga in DW.taVocabolario.GetData())
+                {
+                    answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
+                }
+            }
+            else
+            {
+                foreach (DataLayer_generic.VocabolarioRow riga in taVocabolario.GetData())
+                {
+                    answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
+                }
+            }
+            return answ;
+        }
+
         /// <summary>
         /// effettua setup dei connection strings da web.config delal singola applicazione
         /// </summary>
@@ -59,6 +224,7 @@ namespace SteamWare
             taVocabolario.Connection.ConnectionString = connStr;
             taLogVoc.Connection.ConnectionString = connStr;
         }
+
         /// <summary>
         /// effettua setup dei connection strings da web.config della singola applicazione
         /// </summary>
@@ -79,6 +245,7 @@ namespace SteamWare
             taPermessi.Connection.ConnectionString = connStrPerm;
             taPermessi2Funzione.Connection.ConnectionString = connStrPerm;
         }
+
         /// <summary>
         /// setup delle tabelle vocabolario
         /// </summary>
@@ -112,120 +279,9 @@ namespace SteamWare
             logger.lg.scriviLog(string.Format("Caricati {0} lemmi!", dictVocabolario.Count));
         }
 
-    /// <summary>
+        #endregion Protected Methods
-    /// prende l'oggetto tabVocabolario in ram e lo trasforma in dictionary
-    /// </summary>
-    /// <returns></returns>
-    protected Dictionary<string, string> ricaricaDictVocabolario()
-    {
-      // continuo
-      Dictionary<string, string> answ = new Dictionary<string, string>();
-      if (taVocabolario == null)
-      {
-        foreach (DataLayer_generic.VocabolarioRow riga in DW.taVocabolario.GetData())
-        {
-          answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
-        }
-      }
-      else
-      {
-        foreach (DataLayer_generic.VocabolarioRow riga in taVocabolario.GetData())
-        {
-          answ.Add(riga.Lingua.ToUpper() + "#" + riga.Lemma.ToUpper(), riga.Traduzione);
-        }
-      }
-      return answ;
-    }
 
-    #endregion
+        #region Public Methods
-
-    #region area public
-
-    /// <summary>
-    /// tableAdapter diritti
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.DIRITTITableAdapter taDiritti;
-    /// <summary>
-    /// tableAdapter permessi
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.PermessiTableAdapter taPermessi;
-    /// <summary>
-    /// tableAdapter funzione
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.FUNZIONETableAdapter taFunzione;
-    /// <summary>
-    /// tableAdapter permessi2funzione
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.Permessi2FunzioneTableAdapter taPermessi2Funzione;
-    /// <summary>
-    /// tableAdapter CdC
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.CDCTableAdapter taCdc;
-    /// <summary>
-    /// tableAdapter utenti
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.UTENTETableAdapter taUtente;
-    /// <summary>
-    /// tableAdapter userData (user/pwd)
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.UserDataTableAdapter taUserData;
-    /// <summary>
-    /// tableAdapter userDataExt (user/pwd)
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.UserDataExtTableAdapter taUserDataExt;
-    /// <summary>
-    /// table adapter lingue
-    /// </summary>
-    public DataLayer_genericTableAdapters.LingueTableAdapter taLingue;
-    /// <summary>
-    /// table adapter vocabolario
-    /// </summary>
-    public DataLayer_genericTableAdapters.VocabolarioTableAdapter taVocabolario;
-    /// <summary>
-    /// table adapter versione vocabolario
-    /// </summary>
-    public DataLayer_genericTableAdapters.LogUpdateDbTableAdapter taLogVoc;
-    /// <summary>
-    /// table adapter versione anagrafica
-    /// </summary>
-    public DataLayer_AnagGenTableAdapters.LogUpdateDbTableAdapter taLogAna;
-    /// <summary>
-    /// table adapter Devices utente
-    /// </summary>
-    public DS_devicesTableAdapters.AnagDevicesTableAdapter taAnagDev;
-    /// <summary>
-    /// oggetto vocabolario organizzato come dizionario con chiave lang#lemma e valore la traduzione
-    /// </summary>
-    public Dictionary<string, string> dictVocabolario;
-    /// <summary>
-    /// resetta il vocabolario rileggendo i dati...
-    /// </summary>
-    public void resetVocabolario()
-    {
-      memLayer.ML.emptyCacheVal("dictVocabolario");
-      setupVocabolario();
-    }
-    /// <summary>
-    /// Verifica se il vocabolario sia ok...
-    /// </summary>
-    public bool vocabolarioOk
-    {
-      get
-      {
-        bool answ = false;
-        try
-        {
-          answ = (dictVocabolario != null);
-          if (answ)
-          {
-            answ = dictVocabolario.Count > 0;
-          }
-        }
-        catch
-        { }
-        return answ;
-      }
-    }
 
         /// <summary>
         /// crea nel db corrente il lemma richiesto e lo valorizza come "--{0}--"
@@ -239,38 +295,16 @@ namespace SteamWare
                 taVocabolario.Insert(rigaLingua.Lingua, lemma, string.Format("--{0}--", lemma));
             }
         }
-    /// <summary>
-    /// restituisce conteggio numero record dell'oggetto vocabolario
-    /// </summary>
-    public int numRecVoc
-    {
-      get
-      {
-        int answ = 0;
-        try
-        {
-          answ = dictVocabolario.Count;
-        }
-        catch
-        { }
-        return answ;
-      }
-    }
-    /// <summary>
-    /// elenco lingue ammesse da vocabolario...
-    /// </summary>
-    public DataLayer_generic.LingueDataTable lingue
-    {
-      get
-      {
-        return taLingue.GetData();
-      }
-    }
-    /// <summary>
-    /// classe singleton x la gestione dei tableadapters
-    /// </summary>
-    public static DataWrap DW = new DataWrap();
 
-    #endregion
+        /// <summary>
+        /// resetta il vocabolario rileggendo i dati...
+        /// </summary>
+        public void resetVocabolario()
+        {
+            memLayer.ML.emptyCacheVal("dictVocabolario");
+            setupVocabolario();
+        }
+
+        #endregion Public Methods
     }
 }

SteamWareLib/memLayer.cs

@@ -1967,16 +1967,8 @@ namespace SteamWare
         /// </summary>
         public void resetAppConf()
         {
-            // controlo chiave x evitare doppio reset
-            if (!string.IsNullOrEmpty(getRSV(CleaningKey)))
-            {
-                //imposto veto 10 sec
-                setRSV(CleaningKey, DateTime.Now.ToString(), 10);
             redDelKey(ACBH);
             startupAppConf();
-                // veto 1 sec --> se ne va subito
-                setRSV(CleaningKey, "", 1);
-            }
         }
 
         /// <summary>
@@ -2169,6 +2161,8 @@ namespace SteamWare
         public bool setRSV(string chiave, string valore)
         {
             bool answ = false;
+            if (!string.IsNullOrEmpty(chiave))
+            {
                 try
                 {
                     cache.StringSet(chiave, valore);
@@ -2176,7 +2170,12 @@ namespace SteamWare
                 }
                 catch (Exception exc)
                 {
-                logger.lg.scriviLog(string.Format("Errore in setRSV:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
+                    logger.lg.scriviLog($"Eccezzione in setRSV | chiave: {chiave} | valore: {valore}{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
+                }
+            }
+            else
+            {
+                logger.lg.scriviLog("Errore: chiave non valida (vuota) in setRSV", tipoLog.ERROR);
             }
             return answ;
         }
@@ -2200,7 +2199,7 @@ namespace SteamWare
             }
             catch (Exception exc)
             {
-                logger.lg.scriviLog(string.Format("Errore in setRSV:{0}{1}", Environment.NewLine, exc), tipoLog.EXCEPTION);
+                logger.lg.scriviLog(string.Format($"Errore in setRSV | chiave: {chiave} | valore: {valore} | TTL: {TTL_sec}{Environment.NewLine}{exc}"), tipoLog.EXCEPTION);
             }
             return answ;
         }