Fix some bugs

Benjamin Renard
1 parent 71f1b8e1
Showing 4 changed files with 101 additions and 45 deletions Show diff stats
src/ParamGetImpl/SpeasyProxyInterface/FileReaderCDF.cc
src/ParamGetImpl/SpeasyProxyInterface/ParamGetSpeasyProxy.cc
src/ParamGetImpl/SpeasyProxyInterface/Pusher.hh
src/ParamGetImpl/SpeasyProxyInterface/SpeasyProxyInterfaceConfig.cc
@@ -195,19 +195,19 @@ bool FileReaderCDF::getParamInfo(std::string&amp; paramId, SpeasyProxyParamType&amp; par
  
 bool FileReaderCDF::getCDFVarInfo(std::string paramName, CDFVarInfo& varInfo)
 {
-	if (paramName.empty())
+    if (paramName.empty())
 	{
 		LOG4CXX_ERROR(gLogger, "FileReaderCDF::getCDFVarInfo - Empty param name");
 		return false;
 	}
  
-	if (paramName.size() >= CDF_VAR_NAME_LEN256)
+    if (paramName.size() >= CDF_VAR_NAME_LEN256)
 	{
 		LOG4CXX_ERROR(gLogger, "FileReaderCDF::getCDFVarInfo - Param name too large");
 		return false;
 	}
  
-	//reset info structure
+    //reset info structure
 	memset(&varInfo,0,sizeof(CDFVarInfo));
  
 	//confirm variable existence
@@ -216,20 +216,20 @@ bool FileReaderCDF::getCDFVarInfo(std::string paramName, CDFVarInfo&amp; varInfo)
  
 	varInfo._num = CDFgetVarNum(_cdfid,varInfo._name);
  
-	if (varInfo._num < 0)
+    if (varInfo._num < 0)
 	{
 		LOG4CXX_INFO(gLogger, "FileReaderCDF::getCDFVarInfo - Cannot find variable");
 		return false;
 	}
  
-	//Is it a zVariable?
+    //Is it a zVariable?
 	CDFstatus status = CDFconfirmzVarExistence(_cdfid,varInfo._name);
  
 	bool isZVar = (status == CDF_OK);
  
 	if (isZVar)
 	{
-		//get info about a zVariable
+    	//get info about a zVariable
 		varInfo._type = CDFVT_Z;
  
 		status = CDFinquirezVar(_cdfid, varInfo._num, varInfo._name, &varInfo._dataType,
@@ -243,7 +243,7 @@ bool FileReaderCDF::getCDFVarInfo(std::string paramName, CDFVarInfo&amp; varInfo)
 		}
  
 		status = CDFgetzVarMaxWrittenRecNum(_cdfid, varInfo._num, &varInfo._maxRecNum);
-
+    
 		if (status != CDF_OK)
 		{
 			LOG4CXX_ERROR(gLogger, "FileReaderCDF::getCDFVarInfo - Error to call CDFgetzVarMaxWrittenRecNum");
@@ -260,7 +260,7 @@ bool FileReaderCDF::getCDFVarInfo(std::string paramName, CDFVarInfo&amp; varInfo)
 	}
 	else
 	{
-		//get info about a rVariable
+    	//get info about a rVariable
 		varInfo._type = CDFVT_R;
  
 		status = CDFvarInquire(_cdfid, varInfo._num, varInfo._name,
@@ -293,7 +293,7 @@ bool FileReaderCDF::getCDFVarInfo(std::string paramName, CDFVarInfo&amp; varInfo)
 			return false;
 		}
 	}
-
+    
 	return true;
 }
  
@@ -418,6 +418,10 @@ FileReaderStatus FileReaderCDF::getParamPacketData(std::string&amp; timeId, std::str
 		nbTimeRec = 1;
 	}
  
+    if (nbTimeRec == 0) {
+        return FRS_EOF;
+    }
+
 	//get data
 	long nbRec;
 	long dimSize;
@@ -430,7 +434,7 @@ FileReaderStatus FileReaderCDF::getParamPacketData(std::string&amp; timeId, std::str
 	}
  
 	//check dimension integrity
-	if (dimSize != packet->getDimsSize())
+    if (dimSize != packet->getDimsSize())
 	{
 		LOG4CXX_ERROR(gLogger, "FileReaderCDF::getParamPacketData - Incompatibility between dim size of the packet and the CDF var");
 		return FRS_ERROR;
@@ -623,7 +627,7 @@ bool FileReaderCDF::getCDFData(std::string&amp; varId, long startRec,
 	nbRec = 0;
 	dimSize = 0;
 	CDFVarInfo varInfo;
-	if (!getCDFVarInfo(varId, varInfo))
+    if (!getCDFVarInfo(varId, varInfo))
 	{
 		LOG4CXX_ERROR(gLogger, "FileReaderCDF::getCDFData - Cannot get param info " << varId);
 		return false;
@@ -632,7 +636,7 @@ bool FileReaderCDF::getCDFData(std::string&amp; varId, long startRec,
 	dataType = varInfo._dataType;
 	numBytes = varInfo._numBytes;
  
-	if (varInfo._numElts > 1)
+    if (varInfo._numElts > 1)
 	{
 		//only possible if CDF_CHAR
 		//not implemented (CDF_CHAR variable is not a valid variable for the ParamGet)
@@ -640,29 +644,29 @@ bool FileReaderCDF::getCDFData(std::string&amp; varId, long startRec,
 		return false;
 	}
  
-	if ((varInfo._maxRecNum <= 0) && (varInfo._recVary != 0))
+    if ((varInfo._maxRecNum < 0) && (varInfo._recVary != 0))
 		//no record in file
 		return true;
  
-	nbRec = varInfo._maxRecNum - startRec + 1;
+    nbRec = varInfo._maxRecNum - startRec + 1;
  
 	dimSize = 1;
 	if (varInfo._numDims > 0)
 		for (int i = 0; i < varInfo._numDims; ++i)
 			dimSize *= varInfo._dimSizes[i];
  
-	_workingBuffers->reallocBuffer(bufferType, nbRec*varInfo._numBytes*dimSize);
+    _workingBuffers->reallocBuffer(bufferType, nbRec*varInfo._numBytes*dimSize);
  
 	CDFstatus status = CDFgetVarRangeRecordsByVarName(_cdfid, varInfo._name, startRec,
 		varInfo._maxRecNum, _workingBuffers->getBuffer(bufferType));
  
-	if (status != CDF_OK)
+    if (status != CDF_OK)
 	{
 		LOG4CXX_ERROR(gLogger, "FileReaderCDF::getCDFData - Error to get data for " << varId);
 		return false;
 	}
  
-	return true;
+    return true;
 }
  
 bool FileReaderCDF::extractShort(CDFWorkingBuffers::BufferType bufferType, long recIndex, long dimIndex, long dimSize,
@@ -743,7 +747,7 @@ bool FileReaderCDF::extractFloat(CDFWorkingBuffers::BufferType bufferType, long 
 {
 	//try to extract an int
 	int i;
-	if (extractInt(bufferType, recIndex, dimIndex, dimSize,
+    if (extractInt(bufferType, recIndex, dimIndex, dimSize,
 			dataType, numBytes, i))
 	{
 		//cast int to float
@@ -850,8 +854,8 @@ bool FileReaderCDF::getInfo(const char* pInfoName, std::vector&lt;double&gt;&amp; res)
  
 	//get CDF var info
 	CDFVarInfo varInfo;
-	if (getCDFVarInfo(pInfoName, varInfo)) {
-		scoped_lock.unlock();
+    if (getCDFVarInfo(pInfoName, varInfo)) {
+    	scoped_lock.unlock();
 		std::string emptyTimeStr = "";
 		std::string paramName = pInfoName;
 		SpeasyProxyParamType paramType;
@@ -868,7 +872,7 @@ bool FileReaderCDF::getInfo(const char* pInfoName, std::vector&lt;double&gt;&amp; res)
  
 		packet.init(containerType,paramType,dim1Size,dim2Size);
 		getParamPacketData(emptyTimeStr, paramName, 0, &packet);
-		if (packet.getNbData() > 0) {
+        if (packet.getNbData() > 0) {
 			for (int i = 0; i < dim1Size; ++i) {
 				for (int j = 0; j < dim2Size; ++j) {
 					switch (paramType)
@@ -910,7 +914,7 @@ bool FileReaderCDF::getInfo(const char* pInfoName, std::vector&lt;double&gt;&amp; res)
 			return true;
 		}
 	}
-
+    
 	return false;
 }
  
@@ -28,6 +28,7 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <cstdio>
+#include <boost/filesystem.hpp>
  
 namespace AMDA {
  
@@ -296,7 +297,6 @@ unsigned int ParamGetSpeasyProxy::write()
 	bool isOpen = fileReaderPtr->open(localPath);
  
  
-
 	if(isOpen)
 	{	
 		// Call to getParamPacketData to get CDF data
@@ -311,13 +311,24 @@ unsigned int ParamGetSpeasyProxy::write()
 			status = fileReaderPtr->getParamPacketData(timeParamId, croptedParamId, crtIndex, packet);
             if (status == FRS_ERROR) {
                 delete packet;
+                remove(localPath.c_str());
                 BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::ex_msg("Error to get data from speasy"));
             }
-			crtIndex += packet->getNbData();
-			// Call to the put function of pusher to initiate the ParamData
-			// result == nb of data in ParamData
-			result += _pusher->put(packet);
+            if (packet->getNbData() == 0) {
+                LOG4CXX_DEBUG(gLogger, "ParamGetLocalFile::write => no data packet");
+				_paramData->getTimeList().push_back(_currentInterval->_startTime);
+				_pusher->putNaN();
+				_paramData->getTimeList().push_back(_currentInterval->_stopTime);
+				_pusher->putNaN();
+				result += 2;
+            }
+            else {
+                LOG4CXX_DEBUG(gLogger, "ParamGetLocalFile::write => nb data in packet: " << packet->getNbData());
+                crtIndex += packet->getNbData();
+                result += _pusher->put(packet);
+            }
             delete packet;
+            //remove(localPath.c_str());
 		} while (status == FRS_MORE);
  
  
@@ -339,11 +350,11 @@ unsigned int ParamGetSpeasyProxy::write()
 		else {
 			// Nothing to do.
 		}
-		// if (result != 0) 
-		// 	remove(localPath.c_str());
 		return result;
 	}
     else {
+        if (boost::filesystem::exists(localPath))
+            remove(localPath.c_str());
         BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::ex_msg("Error to get data from speasy"));
     }
  
@@ -367,6 +378,8 @@ void ParamGetSpeasyProxy::updateInfo(Parameter &amp; parameter)
  
 	if (paramInfo == nullptr)
 		return;
+
+    _pusher->setFillValue(paramInfo->getFillValue());
 }
  
 size_t write_data(void *ptr, size_t size, size_t nmemb, FILE *stream) {
@@ -29,7 +29,7 @@ public:
 	/*
 	 * @brief Constructor
 	 */
-	PusherBase (int dim1 = 1, int dim2 = 1) : _paramData(NULL), _dim1(dim1), _dim2(dim2)
+	PusherBase (int dim1 = 1, int dim2 = 1) : _paramData(NULL), _dim1(dim1), _dim2(dim2), _fillValue(NAN)
 	{
 	}
  
@@ -48,11 +48,20 @@ public:
 		return _paramData;
 	}
  
+    void setFillValue(double fillValue) {
+        _fillValue = fillValue;
+    }
+
 	/*
 	 * @brief Virtual method to put a packet in the ParamData
 	 */
 	virtual int put(SpeasyProxyParamDataPacket* packet) = 0;
  
+    /*
+	 * @brief Virtual method to put a NAN in the ParamData
+	 */
+    virtual void putNaN() = 0;
+
 protected:
 	/*
 	 * @brief Pointer to the paramData
@@ -73,6 +82,11 @@ protected:
 	 * @brief Nb data returned by one packet
 	 */
 	// int _nbDataByPacket;
+
+    /*
+	 * @brief Fill value
+	 */
+    double _fillValue;
 };
  
  
@@ -122,7 +136,7 @@ public:
  
 		_specParamData->getDataList().resize(packet->getNbData());
  
-		// BaseElemenType fillEl = _fillValue;
+		BaseElemenType fillEl = _fillValue;
  
 		for (int index = 0; index < packet->getNbData(); ++index)
 		{
@@ -138,9 +152,9 @@ public:
 					//get data element
 					if (packet->getDataValue(&baseElem,index,dim1Index,dim2Index))
 					{
-						// if (!isnan(_fillValue))
-						// 	if (baseElem == fillEl)
-						// 		baseElem << NotANumber();
+						if (!isnan(_fillValue))
+						    if (baseElem == fillEl)
+					        	baseElem << NotANumber();
 					}
 					else
 						baseElem << NotANumber();
@@ -159,6 +173,17 @@ public:
 		return 0;
 	}
  
+    virtual void putNaN() {
+		_specParamData->getDataList().resize(1);
+		ElemenType nanElem = ElemenType(_dim1,_dim2);
+		for(int i = 0; i < _dim1; ++i) {
+			for(int j = 0; j < _dim2; ++j) {
+				nanElem[i][j] << NotANumber();
+			}
+		}
+		_specParamData->getDataList().push_back(nanElem);
+	}
+
 	/*
 	 * @brief ParamData creation
 	 */
@@ -201,7 +226,7 @@ public:
 		//ParamData is created, add data
 		_specParamData->getDataList().resize(packet->getNbData());
  
-		//BaseElemenType fillEl = _fillValue;
+		BaseElemenType fillEl = _fillValue;
  
 		for (int index = 0; index < packet->getNbData(); ++index)
 		{
@@ -215,9 +240,9 @@ public:
 				//get data element
 				if (packet->getDataValue(&baseElem,index,dimIndex))
 				{
-					// if (!isnan(_fillValue))
-					// 	if (baseElem == fillEl)
-					// 		baseElem << NotANumber();
+				    if (!isnan(_fillValue))
+					    if (baseElem == fillEl)
+				        	baseElem << NotANumber();
 				}
 				else
 					baseElem << NotANumber();
@@ -234,6 +259,14 @@ public:
 		return packet->getNbData();
 	}
  
+    virtual void putNaN() {
+		_specParamData->getDataList().resize(1);
+		ElemenType nanElem = ElemenType();
+		nanElem.resize(_dim1);
+		nanElem << NotANumber();
+		_specParamData->getDataList().push_back(nanElem);
+	}
+
 	/*
 	 * @brief ParamData creation
 	 */
@@ -275,7 +308,7 @@ public:
 		//ParamData is created, add data
 		_specParamData->getDataList().resize(packet->getNbData());
  
-		// BaseElemenType fillEl = _fillValue;
+		BaseElemenType fillEl = _fillValue;
  
 		for (int index = 0; index < packet->getNbData(); ++index)
 		{
@@ -286,11 +319,11 @@ public:
 			//get element
 			if (packet->getDataValue(&baseElem,index))
 			{
-				// if (!isnan(_fillValue))
-				// {
-				// 	if (baseElem == fillEl)
-				// 		baseElem << NotANumber();
-				// }
+				if (!isnan(_fillValue))
+				{
+				    if (baseElem == fillEl)
+			        	baseElem << NotANumber();
+				}
 			}
 			else
 				baseElem << NotANumber();
@@ -303,6 +336,13 @@ public:
 		return packet->getNbData();
 	}
  
+    virtual void putNaN() {
+                BaseElemenType valNaN;
+                valNaN << NotANumber();
+		_specParamData->getDataList().resize(1);
+		_specParamData->getDataList().push_back(valNaN);
+	}
+
 	SpecParamData* createParamData() {
 		return new SpecParamData();
 	}
@@ -10,6 +10,5 @@ namespace AMDA {
 namespace SpeasyProxyInterface {
  
 log4cxx::LoggerPtr gLogger = log4cxx::Logger::getLogger("AMDA-Kernel.SpeasyProxyInterface");
-std::string speasy_proxy_url = "http://127.0.0.1:6543";
 } // namespace SpeasyProxyInterface
 } /* namespace AMDA */