From c9ab8d349bb87d8b6a3d04443d08c7d7ab5c119f Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 4 Oct 2018 09:58:17 +0200
Subject: [PATCH] fix bcode specifici (formato ENG-IT)

---
 Jenkinsfile                                  |  2 +-
 MP-Admin/WebUserControls/mod_barcode.ascx.cs | 30 +++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 359ef94c..b0be38a4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=840']) {
+        withEnv(['NEXT_BUILD_NUMBER=841']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.0.${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-Admin/WebUserControls/mod_barcode.ascx.cs b/MP-Admin/WebUserControls/mod_barcode.ascx.cs
index 7b881a5a..207eba8a 100644
--- a/MP-Admin/WebUserControls/mod_barcode.ascx.cs
+++ b/MP-Admin/WebUserControls/mod_barcode.ascx.cs
@@ -121,6 +121,14 @@ namespace MoonProAdmin.WebUserControls
     /// </summary>
     protected string regExp_OK = memLayer.ML.cdv("regExp_OK");
     /// <summary>
+    /// RegExp x Find --> replace (se vettore è | delimited)
+    /// </summary>
+    protected string regExp_Find = memLayer.ML.cdv("regExp_Find");
+    /// <summary>
+    /// RegExp x Replace da Find (se vettore è | delimited)
+    /// </summary>
+    protected string regExp_Replace = memLayer.ML.cdv("regExp_Replace");
+    /// <summary>
     /// titolo pagina
     /// </summary>
     public string titolo
@@ -388,8 +396,28 @@ namespace MoonProAdmin.WebUserControls
     private bool checkIntServ()
     {
       bool answ = false;
+      // IN PRIMIS se c'è in config preprocesso BCode x Find-Replace
+      string BCodeFilt = BCodeVal;
+      if (regExp_Find != "")
+      {
+        // splitto i vettori                   
+        var vettFind = regExp_Find.Split('|');
+        var vettRepl = regExp_Replace.Split('|');
+        // se ho tanti find quanti replace procedo...
+        if (vettFind.Length == vettRepl.Length)
+        {
+          for (int i = 0; i < vettFind.Length; i++)
+          {
+            BCodeFilt = BCodeFilt.Replace(vettFind[i], vettRepl[i]);
+          }
+        }
+        else
+        {
+          logger.lg.scriviLog(string.Format("Attenzione: problema in decodifica barcode find/replace, i aprametri non corrispondono una votla esplosi i vettori:{0}find: {1}{0}replace:{2}", Environment.NewLine, regExp_Find, regExp_Replace));
+        }
+      }
       // cerco esplicitamente sul DB IntegrationServices...
-      var risultato = DataLayer.obj.taIS_TrDati.getOrdini(BCodeVal);
+      var risultato = DataLayer.obj.taIS_TrDati.getOrdini(BCodeFilt);
       if (risultato.Rows.Count > 0)
       {
         var rRes = risultato[0];