From 9294f98df67dcdb4555fb893a380714852243e13 Mon Sep 17 00:00:00 2001 From: Marco De Marco Date: Fri, 22 Nov 2013 11:02:44 +0100 Subject: [PATCH] Minor changes and typo in protocol manager class --- src/ProtocolManager.cpp | 13 +++++++------ src/ProtocolManager.h | 7 +++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp index 2e55c68..d0532a0 100644 --- a/src/ProtocolManager.cpp +++ b/src/ProtocolManager.cpp @@ -18,7 +18,7 @@ ProtocolManager::ProtocolManager(Tango::DeviceImpl* deviceImpl_p, } //============================================================================== -// ProtocolManager::ProtocolManager() +// ProtocolManager::~ProtocolManager() //============================================================================== ProtocolManager::~ProtocolManager() { @@ -26,7 +26,7 @@ ProtocolManager::~ProtocolManager() } //============================================================================== -// ProtocolManager::ProtocolManager() +// ProtocolManager::create() //============================================================================== ProtocolManager::SP ProtocolManager::create(Tango::DeviceImpl* deviceImpl_p, Configuration::SP configuration_sp, DBManager::SP dBManager_sp) @@ -38,7 +38,7 @@ ProtocolManager::SP ProtocolManager::create(Tango::DeviceImpl* deviceImpl_p, } //============================================================================== -// ProtocolManager::ProtocolManager() +// ProtocolManager::setRemoteEndpoint() //============================================================================== void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint) { @@ -243,19 +243,20 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp) if(m_isValidated) { const Request::Metadata& metadataReq = request_sp->metadata(); + int64_t rawTimestamp = metadataReq.timestamp(); - std::tm timestamp = *localtime(&rawTimestamp); + std::tm tmTimestamp = *localtime(&rawTimestamp); DEBUG_STREAM << "ProtocolManager::prepareMetadata() Searching in " << m_validatedSchema << "." << m_validatedTable << " timestamp " - << asctime(×tamp) << " from " << m_remoteEndpoint << endl; + << asctime(&tmTimestamp) << " from " << m_remoteEndpoint << endl; try { if(!m_rowSet_sp) { m_rowSet_sp = m_dBManager_sp->retrieveNewTuples( - m_validatedSchema, m_validatedTable, timestamp); + m_validatedSchema, m_validatedTable, tmTimestamp); m_it = m_rowSet_sp->begin(); } diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h index 86a7c3b..bbf6f08 100644 --- a/src/ProtocolManager.h +++ b/src/ProtocolManager.h @@ -73,11 +73,14 @@ protected: throw(std::runtime_error); //------------------------------------------------------------------------------ -// [Protected] Validation related methods +// [Protected] Columns validation method //------------------------------------------------------------------------------ virtual void validateColumn(const Request::Validation::Column&, DBManager::InformationList&) throw(std::runtime_error); +//------------------------------------------------------------------------------ +// [Protected] Metadata serialization method +//------------------------------------------------------------------------------ virtual void fillMetadata(Response::Metadata*) throw(std::runtime_error); virtual void fillRow(Response::Metadata::Row*) throw(std::runtime_error); @@ -106,7 +109,7 @@ protected: //Retrieved data iterator soci::rowset::const_iterator m_it; - //Retrieved data + //Retrieved data shared pointer boost::shared_ptr< soci::rowset > m_rowSet_sp; //Address and port of remote endpoint -- GitLab