From afc1c15f80b4e2e5c44febd506aed860a431adb3 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sun, 12 Jan 2014 22:46:14 +0000
Subject: [PATCH] EgtGeneral 1.5a2 : Piccole migliorie.

---
 CmdParser.cpp      |  39 +++++++++++++++++++++++++++++----------
 CmdParser.h        |   4 +++-
 EgtGeneral.rc      | Bin 7590 -> 7610 bytes
 EgtGeneral.vcxproj |   3 +--
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/CmdParser.cpp b/CmdParser.cpp
index 82e2eb7..6ebad4d 100644
--- a/CmdParser.cpp
+++ b/CmdParser.cpp
@@ -28,9 +28,8 @@ CreateCmdParser( void)
 
 //----------------------------------------------------------------------------
 CmdParser::CmdParser( void)
+   : m_pTheExecutor( nullptr), m_pLogger( nullptr), m_nLev(0) 
 {
-   m_pTheExecutor = nullptr ;
-   m_pLogger = nullptr ;
 }
 
 //----------------------------------------------------------------------------
@@ -40,7 +39,7 @@ CmdParser::~CmdParser( void)
 
 //----------------------------------------------------------------------------
 bool
-CmdParser::Init( string sCmdFile, ICmdExecutor* pCmdExec, ILogger* pLogger) 
+CmdParser::Init( string sCmdFile, ICmdExecutor* pCmdExec, ILogger* pLogger, int nLev) 
 {
   // inizializzo lo scanner
    if ( ! m_TheScanner.Init( sCmdFile))
@@ -56,6 +55,9 @@ CmdParser::Init( string sCmdFile, ICmdExecutor* pCmdExec, ILogger* pLogger)
   // salvo il gestore di log
    m_pLogger = pLogger ;
 
+  // salvo il livello di esecuzione
+   m_nLev = nLev ;
+
    return true ;
 }
 
@@ -72,7 +74,7 @@ CmdParser::Run( void)
 
 
   // log di inizio file
-   sOut = "--- Start : " + m_TheScanner.GetFilePath() ;
+   sOut = GetInitSpaces() + "--- Start : " + m_TheScanner.GetFilePath() + " ---" ;
    LOG_INFO( m_pLogger, sOut.c_str())
 
   // interpretazione dei comandi del file
@@ -87,16 +89,20 @@ CmdParser::Run( void)
      // deve esserci un comando e deve essere eseguito correttamente
       if ( sCmd.empty()  ||  ! ExecCommand( sCmd, sParams)) {
          bOk = false ;
-         sOut = "Error on line (" + ToString( m_TheScanner.GetCurrLineNbr()) + ") : " + sLine ;
+         sOut = GetInitSpaces() + "Error on line (" + ToString( m_TheScanner.GetCurrLineNbr()) + ") : " + sLine ;
          LOG_ERROR( m_pLogger, sOut.c_str())
       }
    }
 
   // log di fine file
-   if ( bOk)
-      LOG_INFO( m_pLogger, "--- End")
-   else
-      LOG_ERROR( m_pLogger, "--- Stop : error")
+   if ( bOk) {
+      sOut = GetInitSpaces() + "--- End ---" ;
+      LOG_INFO( m_pLogger, sOut.c_str())
+   }
+   else {
+      sOut = GetInitSpaces() + "--- Stop : error ---" ;
+      LOG_ERROR( m_pLogger, sOut.c_str())
+   }
 
    return bOk ;
 }
@@ -128,4 +134,17 @@ CmdParser::ExecCommand( const string& sCmd, const string& sParams)
       return m_pTheExecutor->Execute( sCmd1, sCmd2, vsParams) ;
    else
       return false ;
-}
\ No newline at end of file
+}
+
+//----------------------------------------------------------------------------
+const string
+CmdParser::GetInitSpaces( void)
+{
+   string sIni ;
+
+
+   for ( int i = 0 ; i < m_nLev ; ++ i)
+      sIni += "   " ;
+
+   return sIni ;
+}
diff --git a/CmdParser.h b/CmdParser.h
index 9bc6c04..e7781f9 100644
--- a/CmdParser.h
+++ b/CmdParser.h
@@ -22,14 +22,16 @@ class CmdParser : public ICmdParser
    public :
       CmdParser( void) ;
       ~CmdParser( void) ;
-      bool Init( std::string sCmdFile, ICmdExecutor* pCmdExec, ILogger* pLogger) ;
+      bool Init( std::string sCmdFile, ICmdExecutor* pCmdExec, ILogger* pLogger, int nLev = 0) ;
       bool Run( void) ;
 
    private :
       bool ExecCommand( const std::string& sCmd, const std::string& sParams) ;
+      const std::string GetInitSpaces( void) ;
 
    private :
       CmdScanner    m_TheScanner ;
       ICmdExecutor* m_pTheExecutor ;
       ILogger*      m_pLogger ;
+      int           m_nLev ;
 } ;
diff --git a/EgtGeneral.rc b/EgtGeneral.rc
index 9c399fcb3299cb0d17fa59b592dff5ae6f8fccc2..23cc283e149e338c3e729d1e18771985a4e0937a 100644
GIT binary patch
delta 87
zcmZ2xy~}#TH#SD2%{%!{Gfn=%tuwiSlVkEXPB})S$p<-gCo2do;?!j@VlZGZWH6b0
YP^f=%5w{yNSiL2X!c?>QpwLq;010avp#T5?

delta 59
zcmdmGz07*UH#SDY&EMH%nHdcyALP`XtR=K)^E<99KrT@9G}Gih!90Y_<ab<sn^T0t
FxB#l87E=HK

diff --git a/EgtGeneral.vcxproj b/EgtGeneral.vcxproj
index f08583f..608cd75 100644
--- a/EgtGeneral.vcxproj
+++ b/EgtGeneral.vcxproj
@@ -87,8 +87,7 @@ copy $(TargetPath) \EgtProg\Dll</Command>
       <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy $(TargetDir)$(TargetName).pdb \EgtDev\Lib\
-copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
+      <Command>copy $(TargetDir)$(TargetName).lib \EgtDev\Lib\
 copy $(TargetPath) \EgtProg\Dll</Command>
     </PostBuildEvent>
     <ResourceCompile>