From 92bfd5a12a44390a7778bf7dabc5ee8c38dc4347 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 30 Nov 2019 11:04:21 +0100 Subject: [PATCH] Update gestione path relativo x tmp... --- CMS_SC/ReportCompleto.aspx.cs | 2 +- CMS_SC/Web.config | 1 + CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs | 6 +++--- Jenkinsfile | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMS_SC/ReportCompleto.aspx.cs b/CMS_SC/ReportCompleto.aspx.cs index 2e602d3..2f2a97b 100644 --- a/CMS_SC/ReportCompleto.aspx.cs +++ b/CMS_SC/ReportCompleto.aspx.cs @@ -142,7 +142,7 @@ namespace CMS_SC DtProxy.man.taFRGL.insertQuery(OpAuth.currAuth.email, idxDossier, DateTime.Now, currDoss.Matricola, currDoss.FaseAct, currDoss.RevAct); logger.lg.scriviLog($"Registrato record FRGL: {OpAuth.currAuth.email} | Dossiers {idxDossier} - {currDoss.Matricola}"); // step 1: genera directory lavoro - string currOutPath = $"\\tmp\\{idxDossier}"; + string currOutPath = $"{memLayer.ML.CRS("urlTemp")}{idxDossier}"; logger.lg.scriviLog($"Puntamento alla folder {currOutPath}"); fileMover.obj.setDirectoryMapPath(currOutPath); fileMover.obj.checkDir(); diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index b7d3914..5ab1c2b 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -84,6 +84,7 @@ + diff --git a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs index 6385db2..363b65e 100644 --- a/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs +++ b/CMS_SC/WebUserControls/mod_reportCompleto.ascx.cs @@ -97,13 +97,13 @@ namespace CMS_SC.WebUserControls byte[] bytes = localReport.Render("PDF", null, out mimeType, out encoding, out extension, out streamIds, out warnings); // se รจ un percorso virtuale faccio mapPath... string FilePath = ""; - if (outFilePath.IndexOf("/") < 0) + if (Path.IsPathRooted(outFilePath)) { - FilePath = Server.MapPath(outFilePath); + FilePath = outFilePath; } else { - FilePath = outFilePath; + FilePath = Server.MapPath(outFilePath); } using (FileStream fs = new FileStream(FilePath, FileMode.Create)) { diff --git a/Jenkinsfile b/Jenkinsfile index 8f1bc40..c5ac0c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4270']) { + withEnv(['NEXT_BUILD_NUMBER=4271']) { // env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC'