diff --git a/Jenkinsfile b/Jenkinsfile index 271b0d9..e58ec4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=688']) { + withEnv(['NEXT_BUILD_NUMBER=689']) { // env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/SteamWareLib/fileMover.cs b/SteamWareLib/fileMover.cs index 48489f9..edef464 100644 --- a/SteamWareLib/fileMover.cs +++ b/SteamWareLib/fileMover.cs @@ -774,7 +774,7 @@ namespace SteamWare setDirs(_path); } /// - /// imposta la dir di lavoro impostandola dal mapPath corretto della web app... + /// imposta la dir di lavoro impostandola dal mapPath corretto della web app... (come subfolder della web app) /// /// public void setDirectoryMapPath(string _path) diff --git a/SteamWareLib/pdfUtils.cs b/SteamWareLib/pdfUtils.cs index 0a2e02a..a2744e8 100644 --- a/SteamWareLib/pdfUtils.cs +++ b/SteamWareLib/pdfUtils.cs @@ -32,9 +32,13 @@ namespace SteamWare // copio ogni SINGOLA pagina foreach (var fileName in pdfInFileList) { - currPdfIn = PdfReader.Open(fileName, PdfDocumentOpenMode.Import); - CopyPages(currPdfIn, outPdf); - + try + { + currPdfIn = PdfReader.Open(fileName, PdfDocumentOpenMode.Import); + CopyPages(currPdfIn, outPdf); + } + catch + { } } // salvo! outPdf.Save(pdfOutFilename);