diff --git a/Jenkinsfile b/Jenkinsfile index b25e6427..aead2d2e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1034']) { + withEnv(['NEXT_BUILD_NUMBER=1035']) { // env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MapoDb/resoconti.cs b/MapoDb/resoconti.cs index db3110fd..2b94b136 100644 --- a/MapoDb/resoconti.cs +++ b/MapoDb/resoconti.cs @@ -110,11 +110,14 @@ public class resoconti if (!memLayer.ML.isInCacheObject("StatoMacchine")) { _StatoMacchine = taStatoMacchine.GetData(); - SteamWare.memLayer.ML.setCacheVal("StatoMacchine", _StatoMacchine, true); + string serVal = JsonConvert.SerializeObject(_StatoMacchine); + memLayer.ML.setCacheVal("StatoMacchine", serVal, true); } else { - _StatoMacchine = (MapoDb.DS_applicazione.StatoMacchineDataTable)SteamWare.memLayer.ML.objCacheObj("StatoMacchine"); + string redKey = memLayer.ML.redHash("StatoMacchine"); + string serVal = memLayer.ML.getRSV(redKey); + _StatoMacchine = JsonConvert.DeserializeObject(serVal); } return _StatoMacchine; } @@ -161,16 +164,16 @@ public class resoconti get { if (!memLayer.ML.isInCacheObject("AnagraficaEventi")) - //if (HttpContext.Current.Cache["AnagraficaEventi"] == null) { _AnagraficaEventi = taAnagraficaEventi.GetData(); - SteamWare.memLayer.ML.setCacheVal("AnagraficaEventi", _AnagraficaEventi, true); - //HttpContext.Current.Cache["AnagraficaEventi"] = _AnagraficaEventi; + string serVal = JsonConvert.SerializeObject(_AnagraficaEventi); + memLayer.ML.setCacheVal("AnagraficaEventi", serVal, true); } else { - _AnagraficaEventi = (MapoDb.DS_applicazione.AnagraficaEventiDataTable)SteamWare.memLayer.ML.objCacheObj("AnagraficaEventi"); - //_AnagraficaEventi = (MapoDb.DS_applicazione.AnagraficaEventiDataTable)HttpContext.Current.Cache["AnagraficaEventi"]; + string redKey = memLayer.ML.redHash("AnagraficaEventi"); + string serVal = memLayer.ML.getRSV(redKey); + _AnagraficaEventi = JsonConvert.DeserializeObject(serVal); } return _AnagraficaEventi; } @@ -184,11 +187,14 @@ public class resoconti if (!memLayer.ML.isInCacheObject("AnagArt")) { _AnagArt = taAnagArt.GetData(); - SteamWare.memLayer.ML.setCacheVal("AnagArt", _AnagArt, true); + string serVal = JsonConvert.SerializeObject(_AnagArt); + memLayer.ML.setCacheVal("AnagArt", serVal, true); } else { - _AnagArt = (MapoDb.DS_applicazione.AnagArticoliDataTable)SteamWare.memLayer.ML.objCacheObj("AnagArt"); + string redKey = memLayer.ML.redHash("AnagArt"); + string serVal = memLayer.ML.getRSV(redKey); + _AnagArt = JsonConvert.DeserializeObject(serVal); } return _AnagArt; } @@ -200,16 +206,16 @@ public class resoconti get { if (!memLayer.ML.isInCacheObject("AnagOpr")) - //if (HttpContext.Current.Cache["AnagOpr"] == null) { _AnagOpr = taAnagOpr.GetData(); - SteamWare.memLayer.ML.setCacheVal("AnagOpr", _AnagOpr, true); - //HttpContext.Current.Cache["AnagOpr"] = _AnagOpr; + string serVal = JsonConvert.SerializeObject(_AnagOpr); + memLayer.ML.setCacheVal("AnagOpr", serVal, true); } else { - _AnagOpr = (MapoDb.DS_applicazione.AnagraficaOperatoriDataTable)SteamWare.memLayer.ML.objCacheObj("AnagOpr"); - //_AnagOpr = (MapoDb.DS_applicazione.AnagraficaOperatoriDataTable)HttpContext.Current.Cache["AnagOpr"]; + string redKey = memLayer.ML.redHash("AnagOpr"); + string serVal = memLayer.ML.getRSV(redKey); + _AnagOpr = JsonConvert.DeserializeObject(serVal); } return _AnagOpr; } @@ -249,7 +255,7 @@ public class resoconti /// private void setConnString() { - string _connectionString = SteamWare.memLayer.ML.confReadString("MoonProConnectionString"); + string _connectionString = memLayer.ML.confReadString("MoonProConnectionString"); taMacchine.Connection.ConnectionString = _connectionString; taStatoMacchine.Connection.ConnectionString = _connectionString; taStati.Connection.ConnectionString = _connectionString;