From 0e3971e79540bd83bd06ba581ac80107e5da58c5 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 3 Oct 2020 16:52:32 +0200
Subject: [PATCH] ulteriore update vers steamwarelibs

---
 Jenkinsfile              |  2 +-
 SteamWareLib/memLayer.cs | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f10bbeb..87c8bec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=744']) {
+        withEnv(['NEXT_BUILD_NUMBER=745']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.versionNumberBeta = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
diff --git a/SteamWareLib/memLayer.cs b/SteamWareLib/memLayer.cs
index 9d88563..84437ef 100644
--- a/SteamWareLib/memLayer.cs
+++ b/SteamWareLib/memLayer.cs
@@ -1222,6 +1222,20 @@ namespace SteamWare
             {
                 try
                 {
+                    // cerco come key...
+                    var redVal = getRSV(redHash(nomeVar));
+                    answ = !string.IsNullOrEmpty(redVal);
+                    if (!answ)
+                    {
+                        answ = redKeyPresent(redHash(nomeVar));
+                        // cerco come variabile se NON trovata...
+                        if (!answ)
+                        {
+                            // cerco come hash...
+                            answ = redHashPresent(redHash(nomeVar));
+                        }
+                    }
+#if false
                     // cerco come key...
                     answ = redKeyPresent(redHash(nomeVar));
                     if (!answ)
@@ -1233,8 +1247,9 @@ namespace SteamWare
                     if (!answ)
                     {
                         var redVal = getRSV(redHash(nomeVar));
-                        answ = redVal != null && redVal != "";
+                        answ = !string.IsNullOrEmpty(redVal);
                     }
+#endif
                 }
                 catch (Exception exc)
                 {