removed MBFitsWriter references from CDB and from SystemMake Makefile (6c870b34) · Commits · INAF / DISCOS

Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp

+18 −3

Original line number	Diff line number	Diff line
		@@ -33,9 +33,13 @@ CustomLoggerImpl::CustomLoggerImpl(const ACE_CString& CompName,
		CompName + ":isLogging",
		getComponent()
		);
		m_parser = new SimpleParser::CParser<CustomLoggerImpl>(this, 10);
		}

		CustomLoggerImpl::~CustomLoggerImpl(){}
		CustomLoggerImpl::~CustomLoggerImpl(){
		if(m_parser != NULL)
		delete m_parser;
		}

		ACS::ROstring_ptr CustomLoggerImpl::filename() throw (CORBA::SystemException)
		{
		@@ -194,6 +198,15 @@ CustomLoggerImpl::initialize() throw (ACSErr::ACSbaseExImpl)
		CUSTOM_EXCPT_LOG(__dummy, LM_DEBUG);
		throw __dummy.getComponentErrorsEx();
		}

		/* COMMAND PARSER INITIALIZATION
		=================================*/
		m_parser->add(
		"logMessage",·
		new function1<CustomLoggerImpl, non_constant, void_type, I<string_type> >(this, &CustomLoggerImpl::logMessageImpl),·
		1
		);

		};

		void
		@@ -245,14 +258,16 @@ CustomLoggerImpl::emitACSLog(const char *msg) throw (CORBA::SystemException)
		};

		/*
		Used for debugging purpose, emits a custom log event with the given message and level
		Emits a custom log event with the given message and level
		@param msg: the log message.
		@param level: the CustomLogger::LogLevel level
		*/
		void
		CustomLoggerImpl::emitLog(const char *msg, LogLevel level) throw (CORBA::SystemException)
		{
		CUSTOM_LOG(LM_FULL_INFO, "CustomLoggerImpl::emit_log", (IRA::CustomLoggerUtils::custom2aceLogLevel(level), msg));
		CUSTOM_LOG(LM_FULL_INFO,
		"CustomLoggerImpl::emit_log",
		(IRA::CustomLoggerUtils::custom2aceLogLevel(level), msg));
		};

		void

Medicina/CDB/alma/DataBlock/AntennaParameters/AntennaParameters.xml→Common/Servers/MBFitsWriter/DataBlock/AntennaParameters/AntennaParameters.xml

+0 −0

File moved.

View file

Medicina/CDB/alma/DataBlock/PointingParameters/PointingParameters.xml→Common/Servers/MBFitsWriter/DataBlock/PointingParameters/PointingParameters.xml

+0 −0

File moved.

View file

Medicina/CDB/alma/DataBlock/TimeData/TimeData.xml→Common/Servers/MBFitsWriter/DataBlock/TimeData/TimeData.xml

+0 −0

File moved.

View file

SystemMake/Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ ifeq ($(TARGETSYS),SRT)
		SRTActiveSurface_MODULES:=SRTActiveSurfaceInterface
		Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary XarcosLibrary SRTMinorServoLibrary
		AntennaImplementation_MODULES:=Observatory SkySource OTF Moon PointingModel Refraction AntennaBoss SRTMount
		ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter MBFitsWriter ExternalClients
		ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients
		BackendsImplementation_MODULES:=TotalPower NoiseGenerator XBackend
		ReceiversImplementation_MODULES:=ReceiversBoss SRTKBandMFReceiver SRT7GHzReceiver SRTLPBandReceiver
		WeatherStationImplementation_MODULES:=SRTWeatherStation
		@@ -106,7 +106,7 @@ ifeq ($(TARGETSYS),MED)
		CommonInterface ManagmentInterface AntennaInterface ReceiversInterface BackendsInterface MinorServoInterface WeatherStationInterface ActiveSurfaceInterface XBackendInterface\
		MedicinaAntennaInterface MedicinaWeatherStationInterface \
		SlaLibrary IRALibrary TextWindowLibrary ParserLibrary ComponentProxy ModbusChannel\
		AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter MBFitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \
		AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \
		Metrology TotalPower NoiseGenerator MedicinaMount MedWeatherStation CustomLogger XBackend MedicinaMinorServo\
		AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal CaltoolClient SchedulerTextClient MinorServoBossTextClient\
		MedicinaMountTextClient CustomLoggingClient\
		@@ -123,7 +123,7 @@ ifeq ($(TARGETSYS),MED)
		Receivers_MODULES:=ReceiversInterface
		Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary
		AntennaImplementation_MODULES:=Observatory SkySource OTF Moon PointingModel Refraction AntennaBoss MedicinaMount
		ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter MBFitsWriter ExternalClients
		ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients
		BackendsImplementation_MODULES:=TotalPower NoiseGenerator XBackend
		ReceiversImplementation_MODULES:=ReceiversBoss
		WeatherStationImplementation_MODULES:=MedWeatherStation Metrology
		@@ -152,7 +152,7 @@ ifeq ($(TARGETSYS),NT)
		Receivers_MODULES:=ReceiversInterface
		Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary
		AntennaImplementation_MODULES:=Observatory SkySource OTF Moon PointingModel Refraction AntennaBoss NotoMount
		ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter MBFitsWriter ExternalClients
		ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients
		BackendsImplementation_MODULES:=TotalPower
		ReceiversImplementation_MODULES:=ReceiversBoss