From bf2742c6c7a6a280bef7a3c4faff6df9de6bee53 Mon Sep 17 00:00:00 2001
From: "luca.mazzoleni" <luca.mazzoleni@egalware.com>
Date: Mon, 9 Sep 2024 14:04:46 +0200
Subject: [PATCH] =?UTF-8?q?-=20in=20BatchProcessNew,=20in=20caso=20sia=20r?=
 =?UTF-8?q?ichiesta=20generazione=20senza=20check,=20verifico=20prima=20ch?=
 =?UTF-8?q?e=20il=20file=20log=20specifico=20non=20contenga=20errori:=20se?=
 =?UTF-8?q?=20s=C3=AC,=20forzo=20il=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BatchProcessNew.lua | 18 ++++++++++++++++--
 Version.lua         |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/BatchProcessNew.lua b/BatchProcessNew.lua
index 282124b..94bfe77 100644
--- a/BatchProcessNew.lua
+++ b/BatchProcessNew.lua
@@ -45,9 +45,23 @@ end
 local sLog = 'BatchProcess : ' .. BEAM.FILE .. ', ' .. BEAM.MACHINE .. ', ' .. sFlag
 EgtOutLog( sLog)
 
--- Cancello file di log specifico
 local sLogFile = EgtChangePathExtension( BEAM.FILE, '.txt')
-EgtEraseFile( sLogFile) 
+-- in caso sia richiesta generazione senza check, verifico prima che il file log specifico non contenga errori: se sì, forzo il check
+if BEAM.FLAG == 0 then
+   local hLogFile = io.open( sLogFile, 'r')
+   if hLogFile then
+      for line in hLogFile:lines() do
+         if EgtStartsWith( line, 'ERR') and tonumber( EgtSplitString( line, '=')[2] or 0) > 0 then
+            BEAM.FLAG = 4
+            break
+         end
+      end
+      hLogFile:close()
+   end
+end
+
+-- Cancello file di log specifico
+EgtEraseFile( sLogFile)
 
 -- Funzioni per scrittura su file di log specifico
 local function WriteErrToLogFile( nErr, sMsg, nRot, nCutId, nTaskId)
diff --git a/Version.lua b/Version.lua
index 8bb89ed..4397afb 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,4 +3,4 @@
 
 NAME = 'Beam'
 VERSION = '2.6h2'
-MIN_EXE = '2.6h1'
+MIN_EXE = '2.6e5'