Commit 9294f98d authored by Marco De Marco's avatar Marco De Marco
Browse files

Minor changes and typo in protocol manager class

parent 85f8b296

src/ProtocolManager.cpp

+7 −6
Original line number Diff line number Diff line
@@ -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(&timestamp) << " 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();

                }

src/ProtocolManager.h

+5 −2
Original line number Diff line number Diff line
@@ -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<soci::row>::const_iterator m_it;



    //Retrieved data

    //Retrieved data shared pointer

    boost::shared_ptr< soci::rowset<soci::row> > m_rowSet_sp;



    //Address and port of remote endpoint