Another fix for #6497

Benjamin Renard
1 parent 9fa4d66d
Showing 1 changed file with 23 additions and 62 deletions Show diff stats
src/ParamOutputImpl/Download/DownloadOutput.cc
@@ -213,48 +213,34 @@ void DownloadOutput::applyOneFileStructure(bool separateInfoFile, bool isFirstIn
 {
 	LOG4CXX_DEBUG(_logger,"DownloadOutput::applyOneFileStructure");
 	//create a data file
-	if (isFirstInterval)
-		createNewDataFile();
+	if (isFirstInterval) {
+            if(separateInfoFile) {
+                //create info file
+		std::string filePath = getInfoFilePath(_fileWriter->getExtension());
+		if (!_fileWriter->createNewFile(filePath))
+		{
+			LOG4CXX_ERROR(_logger, "DownloadOutput::applyOneFilePerInterval : Cannot create info file " << filePath);
+			BOOST_THROW_EXCEPTION(AMDA::Parameters::ParamOutput_exception());
+		}
+		_files.push_back(filePath);
+
+		//write info
+		writeInfo(false,false,true);
+            }
+                
+            createNewDataFile();
+        }
 	//write data for each parameters
 	for (auto paramProperties : _downloadProperties.getParamPropertiesList())
 		getParameterDataFromServer(paramProperties->getOutputId());
 	//write info
 	if (isFirstInterval)
 	{
-		if(separateInfoFile)
-                {
-			//write only interval info
-			writeInfo(false,true,false);
-		}
-
-		else
-		{
-			 //write all info
-			 writeInfo(true,false,false);
-		}
+            if (!separateInfoFile) {
+                //write all info
+		writeInfo(false,false,false);
+            }
 	}	
-	
-		//finalize data write
-                _fileWriter->finalize();
-
-         if (separateInfoFile && isFirstInterval)
-         {
-		//create info file
-                 _currentParamId = "";
-		std::string filePath = getInfoFilePath(_fileWriter->getExtension());
-			if (!_fileWriter->createNewFile(filePath))
-			{		
-				LOG4CXX_ERROR(_logger, "DownloadOutput::applyOneFilePerParameterPerInterval : Cannot create info file " << filePath);
-				BOOST_THROW_EXCEPTION(AMDA::Parameters::ParamOutput_exception());
-			}
-                 _files.push_back(filePath);
-                       
-                 //write info
-                 writeInfo(false,false,true);
-          }
-                      
-
-
 }
  
  
@@ -295,34 +281,9 @@ void DownloadOutput::applyOneFilePerInterval(bool separateInfoFile, bool isFirst
 		}
 		_files.push_back(filePath);
  
-		 if (separateInfoFile)
-                {
-	
-       			//write info
-			writeInfo(false,false,false);
-		}else
-		{
-		 writeInfo(false,false,false);
-		}		
+		//write info
+		writeInfo(false,false,true);
 	}
-		_fileWriter->finalize();
-
-                if (separateInfoFile && isFirstInterval)
-                {
-                        //create info file
-                        std::string filePath = getInfoFilePath(_fileWriter->getExtension());
-                        if (!_fileWriter->createNewFile(filePath))
-                     {
-                       LOG4CXX_ERROR(_logger, "DownloadOutput::applyOneFilePerParameterPerInterval : Cannot create info file " << filePath);
-                       BOOST_THROW_EXCEPTION(AMDA::Parameters::ParamOutput_exception());
-                      }
-                     _files.push_back(filePath);
-                     
-                    //write info
-                    writeInfo(false,false,true);
-
-                    }
-
 }
  
 /*