Merge branch 'master' into rm_6616

Hacene SI HADJ MOHAND
2 parents 5d98ad1c ffb71385
Showing 3 changed files with 30 additions and 11 deletions Show diff stats
src/ParamOutputImpl/Download/CMakeLists.txt
src/ParamOutputImpl/Download/DownloadOutput.cc
src/ParamOutputImpl/Download/FileWriterASCIIAbstract.cc
@@ -36,6 +36,7 @@ target_link_libraries(
 	${LOG4CXX_LIBRARIES}
 	${Boost_LIBRARY_DIR}/libboost_system.so 
 	${Boost_LIBRARY_DIR}/libboost_thread.so   
+        ${Boost_LIBRARY_DIR}/libboost_filesystem.so
 	${libcdf_LIBRARIES} 
 	rt
 	Parameters
@@ -788,10 +788,11 @@ std::string DownloadOutput::getFilePath(std::string extension, bool infoFile)
  
 	filePath << "/";
  
+	std::stringstream fileName;
 	if (_downloadProperties.getFileName().empty())
-		filePath << "output-";
+		fileName << "output-";
 	else
-		filePath << _downloadProperties.getFileName() << "-";
+		fileName << _downloadProperties.getFileName() << "-";
  
 	//add parameters ids
 	bool firstParam = true;
@@ -805,10 +806,10 @@ std::string DownloadOutput::getFilePath(std::string extension, bool infoFile)
 		}
  
 		if (!firstParam)
-			filePath << "_";
+			fileName << "_";
 		firstParam = false;
  
-		filePath << paramProperties->getOriginalId();
+		fileName << paramProperties->getOriginalId();
  
 		//add indexes
 		for (auto index : paramProperties->getIndexDefList())
@@ -816,10 +817,11 @@ std::string DownloadOutput::getFilePath(std::string extension, bool infoFile)
 			boost::replace_all(index, "[", "");
 			boost::replace_all(index, "]", "");
 			boost::replace_all(index, "*", "x");
-			filePath << "_" << index;
+			fileName << "_" << index;
 		}
 	}
  
+	std::stringstream fileNameSuffix;
 	if (!infoFile)
 	{
 		if ((_downloadProperties.getOutputStructure() != ONE_FILE) &&
@@ -827,8 +829,8 @@ std::string DownloadOutput::getFilePath(std::string extension, bool infoFile)
 				(_parameterManager.getInputIntervals()->size() != 1))
 		{
 			//add interval index
-			filePath << "_" <<  _currentTimeInterval->_ttName;
-			filePath << "_" << _currentIntervalIndex;
+			fileNameSuffix << "_" <<  _currentTimeInterval->_ttName;
+			fileNameSuffix << "_" << _currentIntervalIndex;
 		}
 		else
 		{
@@ -838,17 +840,25 @@ std::string DownloadOutput::getFilePath(std::string extension, bool infoFile)
 				double lStartTime = _currentTimeInterval->_startTime;
 				char buffer[TIMELENGTH];
 				Double2DD_Time(buffer, lStartTime);
-				filePath << "_" << buffer;
+				fileNameSuffix << "_" << buffer;
 			}
 			else
 			{
 				//add TT name
-				filePath << "_" <<  _currentTimeInterval->_ttName;
+				fileNameSuffix << "_" <<  _currentTimeInterval->_ttName;
 			}
 		}
 	}
 	else
-		filePath << "_info";
+		fileNameSuffix << "_info";
+
+	//check fileName size
+	if (fileName.str().size() + extension.size() + 1 + fileNameSuffix.str().size() > 100) {
+		filePath << fileName.str().substr(0,100-extension.size() - 1 - fileNameSuffix.str().size()) << fileNameSuffix.str();
+	}
+	else {
+		filePath << fileName.str() << fileNameSuffix.str();
+	}
  
 	//add extension
 	filePath << ".";
@@ -14,6 +14,9 @@
 #include <iomanip>
 #include <stdlib.h>
  
+#include <boost/filesystem.hpp>
+#include <boost/functional/hash.hpp>
+
 namespace AMDA {
 namespace ParamOutputImpl {
 namespace Download {
@@ -113,7 +116,12 @@ bool FileWriterASCIIAbstract::addParameter(ParamProperties* paramProp, AMDA::Com
 		_fieldInfoMap[paramProp->getOutputId()].componentsList.push_back(component);
  
 	//temporary file for this parameter
-	std::string paramFileName = _outputFilePath;
+	boost::filesystem::path p{_outputFilePath};
+	std::string paramFileName = p.parent_path().string();
+	paramFileName += boost::filesystem::path::preferred_separator;
+	boost::hash<std::string> string_hash;
+	paramFileName += std::to_string(string_hash(p.filename().string()));
+	//_outputFilePath;
 	paramFileName += "_";
 	paramFileName += paramProp->getOutputId();
 	_fieldInfoMap[paramProp->getOutputId()].filePath = paramFileName;