diff --git a/Jenkinsfile b/Jenkinsfile
index 7d971fdc..45591c40 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1236']) {
+ withEnv(['NEXT_BUILD_NUMBER=1237']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs
index c37a896f..46af77d8 100644
--- a/MP-IO/Controllers/IOBController.cs
+++ b/MP-IO/Controllers/IOBController.cs
@@ -275,7 +275,17 @@ namespace MP_IO.Controllers
connDb.scriviKeepAlive(id, DateTime.Now);
try
{
- DataLayer.remTask4Machine(id, taskName);
+ // converto stringa in tipo task...
+ taskType tName = taskType.nihil;
+ bool fatto = Enum.TryParse(taskName, out tName);
+ if (fatto)
+ {
+ DataLayer.remTask4Machine(id, tName);
+ }
+ else
+ {
+ logger.lg.scriviLog($"remTask2Exe: impossibile riconoscere il comando {taskName} come uno deitipi ammessi, NON aggiunto", tipoLog.ERROR);
+ }
answ = getTask2Exe(id);
}
catch
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index a7c46640..6d03c45a 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -1171,6 +1171,29 @@ namespace MapoDb
{ }
return answ;
}
+ ///
+ /// RIMUOVE un task dall'elenco di quelli salvati
+ ///
+ ///
+ ///
+ ///
+ public static bool remTask4Machine(string idxMacchina, taskType taskKey)
+ {
+ bool answ = false;
+ string currHash = exeTaskHash(idxMacchina);
+ try
+ {
+ // leggo task attuali...
+ var currTask = mTaskMacchina(idxMacchina);
+ currTask.Remove(taskKey.ToString());
+ memLayer.ML.redDelKey(currHash);
+ answ = memLayer.ML.redSaveHashDict(currHash, currTask);
+ logger.lg.scriviLog($"Task REM - idxMacchina: {idxMacchina} | taskKey: {taskKey.ToString()}");
+ }
+ catch
+ { }
+ return answ;
+ }
#if false
///
/// Aggiunge un task all'elenco di quelli salvati (in modalità upsert)
@@ -1195,7 +1218,6 @@ namespace MapoDb
{ }
return answ;
}
-#endif
///
/// RIMUOVE un task dall'elenco di quelli salvati
///
@@ -1219,6 +1241,7 @@ namespace MapoDb
{ }
return answ;
}
+#endif
#endregion