From 79a076aa52127c8d00ba6adafe1ad1bcac67f119 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 4 Feb 2017 18:42:14 +0000
Subject: [PATCH] EgtExecutor 1.8b1 : - aggiunte ExeGetLastMachMgrErrorId e
 ExeGetLastMachMgrErrorString - aggiunta in Lua EgtGetLastMachMgrError.

---
 EXE_MachMgr.cpp |  22 ++++++++++++++++++++++
 EgtExecutor.rc  | Bin 15096 -> 15088 bytes
 LUA_MachMgr.cpp |  19 +++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index 183a5fa..61e062e 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -66,6 +66,28 @@ ExeInsertMachMgr( int nInsGrp)
    return pMachMgr->Insert( nInsGrp) ;
 }
 
+//-----------------------------------------------------------------------------
+//   Errors
+//-----------------------------------------------------------------------------
+int
+ExeGetLastMachMgrErrorId( void)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, 1)
+  // restituisco l'errore
+   return pMachMgr->GetLastErrorId() ;
+}
+
+//-----------------------------------------------------------------------------
+string
+ExeGetLastMachMgrErrorString( void)
+{
+   IMachMgr* pMachMgr = GetCurrMachMgr() ;
+   VERIFY_MACHMGR( pMachMgr, "MachMgr invalid")
+  // restituisco l'errore
+   return pMachMgr->GetLastErrorString() ;
+}
+
 //-----------------------------------------------------------------------------
 //   Machines
 //-----------------------------------------------------------------------------
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index fead5c3209640959624d8f1cc344e0c8c5df4e65..ac18c27476d61d5f2b8e00ba3e22658716815d91 100644
GIT binary patch
delta 227
zcmexS`k{2gCpJzC1|0??AU2$QQB0H3V)JjYwM>(*aAvVuFeCv51G#lK7jW@0O?Kjv
znCz$WVsjmD3L}Q5*K#YFCLa())?}dM#yEMA@Bx^{$#uLzlOM2hY~CZvg=xTVF>z)T
j8~qq3Pm)H~9JP6kEEbKg<%E$n8Yr=Wox0giWtA8JZKy$j

delta 229
zcmexR`lEEiCpK;~1|0??1`{A@G5I%}CZpMARd#V^Rx^eQ28+#(T-HpCW|J>+h)?bi
z5!&1#qQSWN9Ip@~R$X(MCT|cdgXo;>$d$agPv`<8if$_=EE>Ox!L1XN!nAIlEN<%>
Q6p^iqQ$n#WLS=>+01)szdH?_b

diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp
index 171076a..b6f8bf0 100644
--- a/LUA_MachMgr.cpp
+++ b/LUA_MachMgr.cpp
@@ -22,6 +22,23 @@
 
 using namespace std ;
 
+//-------------------------------------------------------------------------------
+//    Errors
+//-------------------------------------------------------------------------------
+static int
+LuaGetLastMachMgrError( lua_State* L)
+{
+  // nessun parametro
+   LuaClearStack( L) ;
+  // recupero identificativo e stringa dell'errore
+   int nErr = ExeGetLastMachMgrErrorId() ;
+   string sErr = ( nErr != 0 ? ExeGetLastMachMgrErrorString() : "") ;
+  // restituisco il risultato
+   LuaSetParam( L, nErr) ;
+   LuaSetParam( L, sErr) ;
+   return 2 ;
+}
+
 //-------------------------------------------------------------------------------
 //    Machines
 //-------------------------------------------------------------------------------
@@ -2964,6 +2981,8 @@ bool
 LuaInstallMachMgr( LuaMgr& luaMgr)
 {
    bool bOk = ( &luaMgr != nullptr) ;
+   // Errors
+   bOk = bOk && luaMgr.RegisterFunction( "EgtGetLastMachMgrError", LuaGetLastMachMgrError) ;
    // Machines
    bOk = bOk && luaMgr.RegisterFunction( "EgtSetCurrMachine", LuaSetCurrMachine) ;
    bOk = bOk && luaMgr.RegisterFunction( "EgtGetCurrMachineName", LuaGetCurrMachineName) ;