diff --git a/TegExecutor.cpp b/TegExecutor.cpp index dcb833d..31398ef 100644 --- a/TegExecutor.cpp +++ b/TegExecutor.cpp @@ -52,13 +52,16 @@ TegExecutor::Execute( const string& sCmd1, const string& sCmd2, const STRVECTOR& // output di debug - sOut = "Cmd = [" + sCmd1 + "][" + sCmd2 + "] Par = [" ; + sOut = sCmd1 ; + if ( ! sCmd2.empty()) + sOut += "." + sCmd2 ; + sOut += "( " ; for ( theConstIter = vsParams.begin() ; theConstIter != vsParams.end() ; ++theConstIter) { if ( theConstIter != vsParams.begin()) - sOut += "][" ; + sOut += ", " ; sOut += *theConstIter ; } - sOut += "]" ; + sOut += ")" ; LOG_DBG_INFO( m_pLogger, sOut.c_str()) // esecuzione comando @@ -112,7 +115,7 @@ TegExecutor::ExecuteRun( const string& sCmd2, const STRVECTOR& vsParams) SetEGkLogger( m_pLogger) ; pGdb->Init() ; pGdbExec->Init( Get( pGdb)) ; - if ( ! pCmdParser->Init( vsParams[0], Get( pGdbExec), m_pLogger)) { + if ( ! pCmdParser->Init( vsParams[0], Get( pGdbExec), m_pLogger, 1)) { string sOut = "Error on Parser.Init (" + vsParams[0] + ")" ; LOG_ERROR( m_pLogger, sOut.c_str()) return false ; diff --git a/TestEGk.cpp b/TestEGk.cpp index 4323d6f..5eaddc7 100644 --- a/TestEGk.cpp +++ b/TestEGk.cpp @@ -14,11 +14,12 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "TegExecutor.h" -#include "/EgtDev/Include/EgnGetModuleVer.h" #include "/EgtDev/Include/EGnDllMain.h" +#include "/EgtDev/Include/EgnGetModuleVer.h" #include "/EgtDev/Include/EGnStringUtils.h" #include "/EgtDev/Include/EGnStringConverter.h" -#include "/EgtDev/Include/EgnCmdParser.h" +#include "/EgtDev/Include/EGnCmdParser.h" +#include "/EgtDev/Include/ENkDllMain.h" #include "/EgtDev/Include/EGkDllMain.h" #include "/EgtDev/Include/EGkGeomDB.h" #include "/EgtDev/Include/EGkGdbExecutor.h" @@ -93,6 +94,7 @@ wmain( int argc, wchar_t* argv[]) // versione delle librerie LOG_INFO( &logger, GetEGnVersion()) + LOG_INFO( &logger, GetENkVersion()) LOG_INFO( &logger, GetEGkVersion()) // nessun errore diff --git a/TestEGk.rc b/TestEGk.rc index 08cf465..2e7c89f 100644 Binary files a/TestEGk.rc and b/TestEGk.rc differ diff --git a/stdafx.h b/stdafx.h index a60a9df..290772c 100644 --- a/stdafx.h +++ b/stdafx.h @@ -28,5 +28,6 @@ #include "/EgtDev/Include/EgtLibVer.h" -#pragma comment(lib, EGTLIBDIR "EgtGeomKernel" EGTLIBVER ".lib") #pragma comment(lib, EGTLIBDIR "EgtGeneral" EGTLIBVER ".lib") +#pragma comment(lib, EGTLIBDIR "EgtNumKernel" EGTLIBVER ".lib") +#pragma comment(lib, EGTLIBDIR "EgtGeomKernel" EGTLIBVER ".lib")