diff --git a/IOB-WIN/IobFileEurom63.cs b/IOB-WIN/IobFileEurom63.cs index 25b83221..344af662 100644 --- a/IOB-WIN/IobFileEurom63.cs +++ b/IOB-WIN/IobFileEurom63.cs @@ -85,6 +85,25 @@ namespace IOB_WIN } } + /// + /// Effettua copia file richeiste + update timing + /// + /// + /// + private void copyRequestFiles(Eurom63.Session connectSession, DateTime adesso) + { + // processo richiesta + processSessionFile(connectSession); + if (adesso > connectSession.SessionValidUntil) + { + connectSession.Active = !connectSession.Cycle; + } + connectSession.Passed = false; + connectSession.SessionStarted = adesso; + connectSession.SessionValidUntil = adesso.AddMinutes(connectSession.ValidityMinutes); + connectSession.RetryVeto = adesso.AddSeconds(connectSession.RetrySec); + } + #endregion Private Methods #region Protected Methods @@ -219,6 +238,11 @@ namespace IOB_WIN connectSession.Active = connectSession.Cycle; connectSession.Passed = true; } + // verifico SE ci sia la richeista sennĂ² la chiedo... + else if (!checkRequest(connectSession)) + { + copyRequestFiles(connectSession, adesso); + } // richiedo SE non ci fosse i dati CONNECT... else { @@ -228,16 +252,7 @@ namespace IOB_WIN { // pulisco eventuali risp vecchie cleanupResp(connectSession.SessionName); - // processo richiesta - processSessionFile(connectSession); - if (adesso > connectSession.SessionValidUntil) - { - connectSession.Active = !connectSession.Cycle; - } - connectSession.Passed = false; - connectSession.SessionStarted = adesso; - connectSession.SessionValidUntil = adesso.AddMinutes(connectSession.ValidityMinutes); - connectSession.RetryVeto = adesso.AddSeconds(connectSession.RetrySec); + copyRequestFiles(connectSession, adesso); } } } diff --git a/Jenkinsfile b/Jenkinsfile index 695e558d..78d5fa16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=721']) { + withEnv(['NEXT_BUILD_NUMBER=722']) { // 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 = 'MAPO-IOB-WIN'