From e1773544e96e72b14c620f12b233e7bbc187a3ef Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 21 Nov 2016 09:12:43 +0000 Subject: [PATCH] Include : - aggiunta gestione chiave base per Exchange. --- EExDllMain.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/EExDllMain.h b/EExDllMain.h index 8e9dae0..84ce6be 100644 --- a/EExDllMain.h +++ b/EExDllMain.h @@ -53,17 +53,19 @@ TestKeyForEEx( const std::string& sKey, int nKeyOpt, ILogger* pLogger) int nOptExpDays ; int nRet = GetKeyOptions( sKey, KEY_BASELIB_PROD, KEY_BASELIB_VER, KEY_BASELIB_LEV, nOpt1, nOpt2, nOptExpDays) ; - if ( nRet != KEY_OK) { - std::string sErr = "Error on Key (EXC/" + ToString( nRet) + ")" ; - LOG_ERROR( pLogger, sErr.c_str()) ; - return false ; - } - if ( ( nOpt1 & ( KEYOPT_EEX_INPBASE|KEYOPT_EEX_EXPBASE)) == 0 || - ( nKeyOpt != 0 && ( nOpt1 & nKeyOpt) == 0) || - nOptExpDays < GetCurrDay()) { - std::string sErr = "Error on Key (EXC/OPT)" ; - LOG_ERROR( pLogger, sErr.c_str()) ; - return false ; + if ( nRet != KEY_OK && ! EqualNoCase( sKey, "EExBase")) { + if ( nRet != KEY_OK) { + std::string sErr = "Error on Key (EXC/" + ToString( nRet) + ")" ; + LOG_ERROR( pLogger, sErr.c_str()) ; + return false ; + } + if ( ( nOpt1 & ( KEYOPT_EEX_INPBASE|KEYOPT_EEX_EXPBASE)) == 0 || + ( nKeyOpt != 0 && ( nOpt1 & nKeyOpt) == 0) || + nOptExpDays < GetCurrDay()) { + std::string sErr = "Error on Key (EXC/OPT)" ; + LOG_ERROR( pLogger, sErr.c_str()) ; + return false ; + } } return true ; }