From 654d9161fb8b3f54f5370903a9b25651f7cbeeeb Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 15 Mar 2018 11:44:32 +0100 Subject: [PATCH] altra prova... --- Jenkinsfile | 2 +- .../WebUserControls/mod_dettMacchina.ascx.cs | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 17f9becd..69f7bc8c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=718']) { + withEnv(['NEXT_BUILD_NUMBER=719']) { // 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.APP_NAME = 'MAPO' diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs index da52dd0f..1afc5303 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs @@ -179,25 +179,29 @@ namespace MoonProTablet.WebUserControls try { string filePath = docFilePath(Disegno); - logger.lg.scriviLog(string.Format("FilePath: {0}", filePath), tipoLog.INFO); fileMover.obj.setDirectory(""); answ = fileMover.obj.fileExist(filePath); // se non trova provo a sostituire "~/" con "./" if (!answ) { - logger.lg.scriviLog(string.Format("FilePath: {0}", filePath.Replace("~/", "./")), tipoLog.INFO); answ = fileMover.obj.fileExist(filePath.Replace("~/", "./")); } - // penultima prova... + // altra prova... if (!answ) { - logger.lg.scriviLog(string.Format("FilePath: {0}", filePath.Replace("~/", "")), tipoLog.INFO); answ = fileMover.obj.fileExist(filePath.Replace("~/", "")); - }// penultima prova... + } + // altra prova... if (!answ) { - logger.lg.scriviLog(string.Format("FilePath: {0}", filePath.Replace("~/", "e:\\")), tipoLog.INFO); - answ = fileMover.obj.fileExist(filePath.Replace("~/", "e:\\")); // hard coded da evitare... + fileMover.obj.setDirectory(Server.MapPath("")); + answ = fileMover.obj.fileExist(filePath); + } + // altra prova... + if (!answ) + { + fileMover.obj.setDirectory(Server.MapPath("")); + answ = fileMover.obj.fileExist(filePath.Replace("~/", "")); } } catch (Exception exc)