Commit 9973b8dc authored by Marco De Marco's avatar Marco De Marco
Browse files

Instrument, destinatio, mapping and configuration refactored

parent b285c59c

src/Configuration.h

+8 −8
Original line number Original line Diff line number Diff line
@@ -10,14 +10,14 @@ class Configuration 
{

{

public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public shared pointer typedef	

//	[Public] Shared pointer typedef	

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	typedef boost::shared_ptr<Configuration> SP;

	typedef boost::shared_ptr<Configuration> SP;

	typedef std::vector< SP > SPVector;

	typedef std::vector< SP > SPVector;





private:

private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private constructor destructor and deleter

//	[Private] Constructor destructor deleter

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	Configuration(std::string watchPath, int workerNumber, int waitTime, 

	Configuration(std::string watchPath, int workerNumber, int waitTime, 

		int connectionNumber, uint32_t iNotifyMask): m_watchPath(watchPath),

		int connectionNumber, uint32_t iNotifyMask): m_watchPath(watchPath),
@@ -25,9 +25,9 @@ private: 
		m_connectionNumber(connectionNumber), m_iNotifyMask(iNotifyMask) {}

		m_connectionNumber(connectionNumber), m_iNotifyMask(iNotifyMask) {}

	virtual ~Configuration() {}

	virtual ~Configuration() {}





	class deleter;

	class Deleter;

	friend class deleter;

	friend class Deleter;

	class deleter

	class Deleter

	{

	{

	public:

	public:

		void operator()(Configuration* c) { delete c; }

		void operator()(Configuration* c) { delete c; }
@@ -35,13 +35,13 @@ private: 




public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public methods

//	[Public] User methods

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	static Configuration::SP create(std::string watchPath, int workerNumber,

	static Configuration::SP create(std::string watchPath, int workerNumber,

        int waitTime, int connectionNumber, uint32_t iNotifyMask)		

        int waitTime, int connectionNumber, uint32_t iNotifyMask)		

	{

	{

		Configuration::SP c_sp(new Configuration(watchPath, workerNumber, 

		Configuration::SP c_sp(new Configuration(watchPath, workerNumber, 

			 waitTime, connectionNumber, iNotifyMask), Configuration::deleter());

			 waitTime, connectionNumber, iNotifyMask), Configuration::Deleter());

			 

			 

		return c_sp;

		return c_sp;

	}			

	}
@@ -54,7 +54,7 @@ public: 




private:

private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private class member variables

//	[Private] class variables

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	//INotify watch path

	//INotify watch path

	const std::string m_watchPath;

	const std::string m_watchPath;

src/Destination.h

+15 −15
Original line number Original line Diff line number Diff line
@@ -10,14 +10,14 @@ class Destination 
{

{

public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public shared pointer typedef	

//	[Public] Shared pointer typedef	

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	typedef boost::shared_ptr<Destination> SP;

	typedef boost::shared_ptr<Destination> SP;

	typedef std::vector< Destination::SP > SPVector;

	typedef std::vector< Destination::SP > SPVector;





private:

private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private constructor destructor and deleter

//	[Private] Constructor destructor deleter

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	Destination(std::string host, int port, std::string user, std::string password,

	Destination(std::string host, int port, std::string user, std::string password,

		std::string schema, std::string table, std::string storagePath, 

		std::string schema, std::string table, std::string storagePath,
@@ -27,9 +27,9 @@ private: 
		m_mapping_spvector(mapping_spvector) {}

		m_mapping_spvector(mapping_spvector) {}

	~Destination() {}

	~Destination() {}





	class deleter;

	class Deleter;

	friend class deleter;

	friend class Deleter;

	class deleter

	class Deleter

	{

	{

	public:

	public:

		void operator()(Destination* d) { delete d; }

		void operator()(Destination* d) { delete d; }
@@ -37,7 +37,7 @@ private: 




public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public methods

//	[Public] Users methods

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	static Destination::SP create( std::string host, int port,

	static Destination::SP create( std::string host, int port,

		std::string user, std::string password, std::string schema,

		std::string user, std::string password, std::string schema,
@@ -46,7 +46,7 @@ public: 
	{

	{

		Destination::SP d_sp( new Destination(host, port, user, password,

		Destination::SP d_sp( new Destination(host, port, user, password,

			schema, table, storagePath, mapping_spvector), 

			schema, table, storagePath, mapping_spvector), 

			Destination::deleter() );

			Destination::Deleter() );

		return d_sp;

		return d_sp;

	}

	}
@@ -61,7 +61,7 @@ public: 




private:

private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private class member variables

//	[Private] class variables

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	//Meta data database host

	//Meta data database host

	const std::string m_host;

	const std::string m_host;

src/Instrument.h

+9 −9
Original line number Original line Diff line number Diff line
@@ -10,14 +10,14 @@ class Instrument 
{

{

public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public shared pointer typedef	

//	[Public] Shared pointer typedef	

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	typedef boost::shared_ptr<Instrument> SP;

	typedef boost::shared_ptr<Instrument> SP;

	typedef std::vector< SP > SPVector;

	typedef std::vector< SP > SPVector;





private:

private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private constructor destructor and deleter

//	[Private] Constructor destructor deleter

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	Instrument(std::string name, std::string fitsKey, std::string fitsValue,

	Instrument(std::string name, std::string fitsKey, std::string fitsValue,

		std::string fitsDate, boost::shared_ptr<Destination> destination_sp) :		

		std::string fitsDate, boost::shared_ptr<Destination> destination_sp) :
@@ -25,9 +25,9 @@ private: 
		m_fitsDate(fitsDate), m_destination_sp(destination_sp) {}		

		m_fitsDate(fitsDate), m_destination_sp(destination_sp) {}		

	~Instrument() {}

	~Instrument() {}





	class deleter;

	class Deleter;

	friend class deleter;

	friend class Deleter;

	class deleter

	class Deleter

	{

	{

	public:

	public:

		void operator()(Instrument* i) { delete i; }

		void operator()(Instrument* i) { delete i; }
@@ -35,13 +35,13 @@ private: 




public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public methods

//	[Public] Users methods

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	static Instrument::SP create(std::string name, std::string fitsKey,

	static Instrument::SP create(std::string name, std::string fitsKey,

		std::string fitsValue, std::string fitsDate, Destination::SP destination_sp)		

		std::string fitsValue, std::string fitsDate, Destination::SP destination_sp)		

	{

	{

		Instrument::SP d_sp( new Instrument(name, fitsKey, fitsValue, fitsDate,

		Instrument::SP d_sp( new Instrument(name, fitsKey, fitsValue, fitsDate,

			 destination_sp), Instrument::deleter() );

			 destination_sp), Instrument::Deleter() );

		return d_sp;

		return d_sp;

	}

	}
@@ -53,7 +53,7 @@ public: 




private:

private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private class member variables

//	[Private] Class variables

//------------------------------------------------------------------------------    

//------------------------------------------------------------------------------    

	//Instrument name

	//Instrument name

	const std::string m_name;

	const std::string m_name;

src/Mapping.h

+9 −9
Original line number Original line Diff line number Diff line
@@ -9,15 +9,15 @@ class Mapping 
{

{

public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public shared pointer typedef	

//	[Public] Shared pointer typedef	

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	typedef boost::shared_ptr<Mapping> SP;

	typedef boost::shared_ptr<Mapping> SP;

	typedef std::vector< Mapping::SP > SPVector;

	typedef std::vector< Mapping::SP > SPVector;





private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private constructor destructor and deleter

//	[Private] Constructor destructor deleter

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

private:

	Mapping(std::string columnName, std::string columnType,

	Mapping(std::string columnName, std::string columnType,

		std::string fitsPrimary, std::string fitsSecondary,

		std::string fitsPrimary, std::string fitsSecondary,

		bool mandatory) : m_columnName(columnName),

		bool mandatory) : m_columnName(columnName),
@@ -25,9 +25,9 @@ private: 
		m_fitsSecondary(fitsSecondary), m_mandatory(mandatory) {}

		m_fitsSecondary(fitsSecondary), m_mandatory(mandatory) {}

	~Mapping() {}

	~Mapping() {}





	class deleter;

	class Deleter;

	friend class deleter;

	friend class Deleter;

	class deleter

	class Deleter

	{

	{

	public:

	public:

		void operator()(Mapping* m) { delete m; }	

		void operator()(Mapping* m) { delete m; }
@@ -35,14 +35,14 @@ private: 




public:

public:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Public methods

//	[Public] Users methods

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

	static Mapping::SP create(std::string columnName,

	static Mapping::SP create(std::string columnName,

	 	std::string columnType, std::string fitsPrimary,

	 	std::string columnType, std::string fitsPrimary,

		std::string fitsSecondary, bool mandatory)

		std::string fitsSecondary, bool mandatory)

	{

	{

		Mapping::SP m_sp( new Mapping( columnName, columnType, fitsPrimary,

		Mapping::SP m_sp( new Mapping( columnName, columnType, fitsPrimary,

			fitsSecondary, mandatory), Mapping::deleter());

			fitsSecondary, mandatory), Mapping::Deleter());

		return m_sp;	

		return m_sp;	

	}

	}
@@ -54,7 +54,7 @@ public: 




private:

private:

//------------------------------------------------------------------------------

//------------------------------------------------------------------------------

//	Private class member variables

//	[Private] Class variables

//------------------------------------------------------------------------------    

//------------------------------------------------------------------------------    

	//Metadata table column name

	//Metadata table column name

	const std::string m_columnName;

	const std::string m_columnName;