Commit 0a7eb4d0 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merge branch 'master' of github.com:discos/discos into centos_7_compatibility

parents 25c47227 c6feb397

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -99,4 +99,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
## Fixed

## Changed

	 issue #689 - The dataset provided by wether station has been enlarged by the wind direction. The correctponding RAL 'wx' command will noe provided wind direction readout, as well

    issue #621 - The maximum number of chars of the schedule file name is now 37 (extension included). This is done for fits file and archive issue with the lenght of the schedule name.

Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i

+4 −20
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon 
{

	//IRA::CError err;

	baci::ThreadSyncGuard guard(&m_mutex);

	if (m_currentRecvCode=="KKC") {

	/*if (m_currentRecvCode=="KKC") {

		loadReceiver(); //  ComponentErrors::CouldntGetComponentExImpl

		try {

			m_currentRecv->calOn();
@@ -101,15 +101,7 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon 
			throw impl;

		}

	}

/*	else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")){

		char buffer [14] = {'s','e','t',' ','m','a','r','c','a','c',' ','o','n','\n' };

		if (!sendToRecvControl((const void *)buffer,14)) {

			_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOn()");

			m_status=Management::MNG_FAILURE;

			throw impl;

		}

	}*/

	else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {

	else */if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC"))  {

		m_calMux_proxy->calOn();

		// turn the marca on through the FS

		/*IRA::CString fsBuffer("calon\n");
@@ -134,7 +126,7 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo 
{

	//IRA::CError err;

	baci::ThreadSyncGuard guard(&m_mutex);

	if (m_currentRecvCode=="KKC") {

	/*if (m_currentRecvCode=="KKC") {

		loadReceiver(); //  ComponentErrors::CouldntGetComponentExImpl

		try {

			m_currentRecv->calOff();
@@ -166,15 +158,7 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo 
			throw impl;

		}

	}

	/*else if ((m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {

		char buffer [15] = {'s','e','t',' ','m','a','r','c','a','c',' ','o','f','f','\n' };

		if (!sendToRecvControl((const void *)buffer,15)) {

			_EXCPT(ComponentErrors::SocketErrorExImpl,impl,"CRecvBossCore::calOff()");

			m_status=Management::MNG_FAILURE;

			throw impl;

		}

	}*/

	else if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC")) {

	else*/ if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC")) {

		// turn the marca on through thr FS

		/*IRA::CString fsBuffer("caloff\n");

		if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {

Common/Servers/Scheduler/include/Schedule.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#define _SCHED_NULLTARGET "NULL"

#define SEPARATOR '\t'

#define MAX_SCHED_NAME_LEN 37



/**

 * This namespace contains all the classes and symbol that are needed to parse and execute the schedules

Common/Servers/Scheduler/src/Schedule.cpp

+4 −0
Original line number Diff line number Diff line
@@ -111,6 +111,10 @@ CBaseSchedule::~CBaseSchedule() 
bool CBaseSchedule::readAll(bool check)

{

	IRA::CString err;

	if (m_fileName.GetLength()>MAX_SCHED_NAME_LEN) {

		m_lastError.Format("Schedule name exceeds the maximum allowed characters of %d",MAX_SCHED_NAME_LEN);

		return false;

	}

	if (!m_parser->open(m_fileName)) {

		m_lastError.Format("Cannot open file %s",(const char *)m_fileName);

		return false;

SRT/CDB/alma/BACKENDS/Sardara/Sardara.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

               sender_protocols="TCP=${HOST}:14000"

               IPAddress="127.0.0.1"

               Port="12800"

               Port="12801"

               CommandLineTimeout="100000000"

               ConnectTimeout="300000000"

               PropertyRefreshTime="1000000"