RcsId useless var removed, compile warning fixed (6fa93292) · Commits · IA2 / fits_importer

src/ClassFactory.cpp

+1 −1

Original line number	Diff line number	Diff line
		/----- PROTECTED REGION ID(FitsImporter::ClassFactory.cpp) ENABLED START -----/
		static const char *RcsId = "$Id: $";
		//static const char *RcsId = "$Id: $";
		//=============================================================================
		//
		// file : ClassFactory.cpp

src/FitsImporter.cpp

+22 −19

Original line number	Diff line number	Diff line
		/----- PROTECTED REGION ID(FitsImporter.cpp) ENABLED START -----/
		static const char *RcsId = "$Id: $";
		//static const char *RcsId = "$Id: $";
		//=============================================================================
		//
		// file : FitsImporter.cpp
		@@ -194,8 +194,11 @@ void FitsImporter::init_device()
		Instrument::SPVector m_instrumentList_spvector =
		dMDBImporter->retrieveInstrumentList(instrumentList);

		Instrument::SP m_defaultInstrument_sp;

		//Initialize default instrument from data model database parameters
		Instrument::SP m_defaultInstrument_sp =
		if(!defaultInstrument.empty())
		m_defaultInstrument_sp =
		dMDBImporter->retrieveInstrument(defaultInstrument);

		//Disconnect
		@@ -209,13 +212,13 @@ void FitsImporter::init_device()
		{
		set_state(Tango::FAULT);
		std::stringstream error_stream;
		error_stream << "Get device property: " << ex.what() << std::endl;
		error_stream << "FitsImporter::init_device() " << ex.what() << std::endl;
		set_status(error_stream.str());
		}
		catch(...)
		{
		set_state(Tango::FAULT);
		set_status("Get device property: unknown error");
		set_status("FitsImporter::init_device() unknown error");
		}
		}

		@@ -475,7 +478,7 @@ void FitsImporter::get_device_property()
		if(sleepTime<MIN_SLEEP_TIME \|\| sleepTime>MAX_SLEEP_TIME)
		throw(invalid_argument("SleepTime property is out of range or not defined"));

		if(waitTime<MIN_WAIT_TIME \|\| waitTime>MAX_WAIT_TIME)
		if(waitTime>MAX_WAIT_TIME)
		throw(invalid_argument("WaitTime property is out of range or not defined"));

		if(instrumentList.empty())
		@@ -491,12 +494,12 @@ void FitsImporter::get_device_property()
		}

		if(defaultInstrument.empty())
		throw(invalid_argument("DefaultInstrument property is empty or not defined"));
		WARN_STREAM << "DefaultInstrument property is empty or not defined" << endl;

		if(dMDBHost.empty())
		throw(invalid_argument("DMDBHost property is empty or not defined"));

		if(dMDBPort<MIN_DMDB_PORT \|\| dMDBPort>MAX_DMDB_PORT)
		if(dMDBPort>MAX_DMDB_PORT)
		throw(invalid_argument("DMDB property out of range or not defined"));

		if(dMDBUser.empty())
		@@ -521,7 +524,7 @@ void FitsImporter::get_device_property()
		{
		set_state(Tango::FAULT);
		stringstream error_stream;
		error_stream << "FitsImporter::get_device_property(): " << ex.what() << endl;
		error_stream << "FitsImporter::get_device_property() " << ex.what() << endl;
		set_status(error_stream.str());
		}

		@@ -536,7 +539,7 @@ void FitsImporter::get_device_property()
		//--------------------------------------------------------
		void FitsImporter::always_executed_hook()
		{
		INFO_STREAM << "FitsImporter::always_executed_hook() " << device_name << endl;
		DEBUG_STREAM << "FitsImporter::always_executed_hook() " << device_name << endl;
		/----- PROTECTED REGION ID(FitsImporter::always_executed_hook) ENABLED START -----/

		if(get_state() != Tango::FAULT)
		@@ -666,13 +669,13 @@ void FitsImporter::on()
		{
		set_state(Tango::FAULT);
		std::stringstream error_stream;
		error_stream << "FitsImporter::On(): " << ex.what() << std::endl;
		error_stream << "FitsImporter::On() " << ex.what() << std::endl;
		set_status(error_stream.str());
		}
		catch(...)
		{
		set_state(Tango::FAULT);
		set_status("FitsImporter::On(): unknown error");
		set_status("FitsImporter::On() unknown error");
		}

		/----- PROTECTED REGION END -----/ // FitsImporter::on
		@@ -698,13 +701,13 @@ void FitsImporter::off()
		{
		set_state(Tango::FAULT);
		std::stringstream error_stream;
		error_stream << "FitsImporter::Off(): " << ex.what() << std::endl;
		error_stream << "FitsImporter::Off() " << ex.what() << std::endl;
		set_status(error_stream.str());
		}
		catch(...)
		{
		set_state(Tango::FAULT);
		set_status("FitsImporter::Off(): unknown error");
		set_status("FitsImporter::Off() unknown error");
		}

		/----- PROTECTED REGION END -----/ // FitsImporter::off
		@@ -795,7 +798,7 @@ uint32_t FitsImporter::create_inotify_mask(const std::vector<std::string>& event
		for(it=event_list.begin(); it!=event_list.end(); it++)
		{
		std::stringstream event_stream;
		event_stream << "FitsImporter::create_inotify_mask(): ";
		event_stream << "FitsImporter::create_inotify_mask() ";

		if(it->compare("IN_ACCESS")==0)
		{
		@@ -864,10 +867,10 @@ uint32_t FitsImporter::create_inotify_mask(const std::vector<std::string>& event
		iNotifyMask += IN_ALL_EVENTS;
		}
		else
		throw std::invalid_argument("FitsImporter::create_inotify_mask(): "
		throw std::invalid_argument("FitsImporter::create_inotify_mask() "
		"string \"" + *it + " \" is invalid inotify event");

		DEBUG_STREAM << event_stream.str() << endl;
		INFO_STREAM << event_stream.str() << endl;
		}

		return iNotifyMask;

src/FitsImporter.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -99,16 +99,16 @@ private:
		static const unsigned long MAX_SLEEP_TIME = 10000;

		//Min milli second of wait time allowed
		static const unsigned long MIN_WAIT_TIME = 0;
		//static const unsigned long MIN_WAIT_TIME = 0;

		//Max milli second of wait time allowed
		static const unsigned long MAX_WAIT_TIME = 10000;

		//Min port number allowed value
		static const unsigned long MIN_DMDB_PORT = 1;
		//static const unsigned long MIN_DMDB_PORT = 0;

		//Max port number allowed value
		static const unsigned long MAX_DMDB_PORT = 65535;
		static const unsigned int MAX_DMDB_PORT = 65535;

		/----- PROTECTED REGION END -----/ // FitsImporter::Data Members

		@@ -149,7 +149,7 @@ public:
		// DMDBHost: Hostname where data model database is running
		string dMDBHost;
		// DMDBPort: Port where data model database is listening
		Tango::DevUShort dMDBPort;
		Tango::DevULong dMDBPort;
		// DMDBUser: User to login in data model database
		string dMDBUser;
		// DMDBPassword: Password to login in data model database

src/FitsImporter.xmi

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</classProperties>
		<classProperties name="DMDBPort" description="Port where data model database is listening">
		<type xsi:type="pogoDsl:UShortType"/>
		<type xsi:type="pogoDsl:UIntType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</classProperties>
		<classProperties name="DMDBUser" description="User to login in data model database">

src/FitsImporterClass.cpp

+1 −1

Original line number	Diff line number	Diff line
		/----- PROTECTED REGION ID(FitsImporterClass.cpp) ENABLED START -----/
		static const char *RcsId = "$Id: $";
		//static const char *RcsId = "$Id: $";
		static const char *TagName = "$Name: $";
		static const char *CvsPath = "$Source: $";
		static const char *SvnPath = "$HeadURL: $";