diff --git a/src/ParamOutputImpl/Download/FileWriterASCIITabular.cc b/src/ParamOutputImpl/Download/FileWriterASCIITabular.cc index e4d0bd5..100e8b8 100644 --- a/src/ParamOutputImpl/Download/FileWriterASCIITabular.cc +++ b/src/ParamOutputImpl/Download/FileWriterASCIITabular.cc @@ -95,7 +95,21 @@ void FileWriterASCIITabular::writeSingleInfo(std::string key, std::string value, std::string prefix; for (int i = 0; i < level; ++i) prefix += " "; - _outputFile << "# " << prefix << key << " : " << value << std::endl; + std::stringstream ss(value); + std::string info_line; + bool first_line = true; + while(std::getline(ss,info_line,'\n')){ + _outputFile << "# " << prefix; + if (first_line) { + _outputFile << key << " : "; + first_line = false; + } + else { + for (int i = 0; i < (int)key.size()+3; ++i) + _outputFile << " "; + } + _outputFile << info_line << std::endl; + } } void FileWriterASCIITabular::writeBeginInfoList(std::string /*title*/, int /*level*/) diff --git a/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/content.txt b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/content.txt new file mode 100644 index 0000000..a874bcf --- /dev/null +++ b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/content.txt @@ -0,0 +1,33 @@ +!1 #5375 : header fichier , manque parfois des # + +!define path {../test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/} +!define executable {amdaXMLRequestorTool } + +!2 Description de l'anomalie + +Lorsqu'un saut de ligne est effectué dans une metadonnées de description d'un paramètre, d'un dataset, d'un instrument ou d'une mission, le header d'une sortie ASCII du paramètre contient des lignes sans #. +Cela empéche le parse du fichier par certains outils. + +!2 Description de la correction + +Un # est ajouté pour chaque ligne de la métadonnées. + +!2 Test + +!3 Connexion au serveur + +!|script|ConnectToDDServer| +|check|login|1| + +!|script|TestAmdaCommandLine| +|set|${path}|path| + +!3 Exécution des scripts + +!|script|TestAmdaCommandLine| +|note|!- Sortie ASCII d'un paramètre dont des metadonnées du fichier de description du dataset contient des sauts de ligne -!| +|check|executeWithInfo|${executable}|command|${path}request_5375_00.xml|args|0| +|check|execute|diff|command|output-dst_info_break_line_2008000000000000.txt ${path}/download_5375_00_REF.txt|args|0| + +----- +!contents -R2 -g -p -f -h diff --git a/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/download_5375_00_REF.txt b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/download_5375_00_REF.txt new file mode 100644 index 0000000..5d647a2 --- /dev/null +++ b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/download_5375_00_REF.txt @@ -0,0 +1,73 @@ +# ----------- +# AMDA INFO : +# ----------- +# AMDA_ABOUT : Created by AMDA(c) +# AMDA_VERSION : none-for-test +# AMDA_ACKNOWLEDGEMENT : CDPP/AMDA Team +# +# -------------- +# REQUEST INFO : +# -------------- +# REQUEST_STRUCTURE : one-file-per-interval +# REQUEST_TIME_FORMAT : DD Time +# REQUEST_OUTPUT_PARAMS : dst_info_break_line +# +# ----------------- +# BASE PARAMETERS : +# ----------------- +# +# MISSION_ID : indices +# MISSION_NAME : Indices +# MISSION_DESCRIPTION : All_Indices +# MISSION_URL : http://wdc.kugi.kyoto-u.ac.jp/ +# +# INSTRUMENT_ID : indices_ground_based +# INSTRUMENT_NAME : Ground_Based +# INSTRUMENT_DESCRIPTION : Final/Provisional/QuickLook +# INSTRUMENT_URL : http://wdc.kugi.kyoto-u.ac.jp/ +# INSTRUMENT_MEASUREMENT_TYPE : MeasurementType +# INSTRUMENT_PI : Elena Budnik +# INSTRUMENT_TYPE : InstrumentType +# +# DATASET_ID : ground_based_dst_break_line +# DATASET_NAME : Dst +# DATASET_DESCRIPTION : Dst dataset from DDServer +# DATASET_SOURCE : CDPP/DDServer +# DATASET_GLOBAL_START : 2008-01-01T00:00:00.000 +# DATASET_GLOBAL_STOP : 2008-02-29T23:59:59.000 +# DATASET_MIN_SAMPLING : 3600 +# DATASET_MAX_SAMPLING : 3600 +# DATASET_CAVEATS : None +# DATASET_ACKNOWLEDGEMENT : CDPP acknowledgement... +# Saut de ligne +# +# PARAMETER_ID : dst_info_break_line +# PARAMETER_NAME : dst +# PARAMETER_SHORT_NAME : dst +# PARAMETER_UNITS : nT +# PARAMETER_TENSOR_ORDER : 0 +# PARAMETER_TABLE : None +# PARAMETER_FILL_VALUE : nan +# +# +# --------------- +# INTERVAL INFO : +# --------------- +# INTERVAL_START : 2008-01-01T00:00:00.000 +# INTERVAL_STOP : 2008-01-01T10:00:00.000 +# +# ------ +# DATA : +# ------ +# DATA_COLUMNS : AMDA_TIME, dst_info_break_line +# + 2008000010000000 -11.000 + 2008000020000000 -8.000 + 2008000030000000 -7.000 + 2008000040000000 -5.000 + 2008000050000000 -3.000 + 2008000060000000 -5.000 + 2008000070000000 -6.000 + 2008000080000000 -5.000 + 2008000090000000 -5.000 + 2008000100000000 -7.000 diff --git a/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/properties.xml b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/properties.xml new file mode 100644 index 0000000..8791029 --- /dev/null +++ b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/properties.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/request_5375_00.xml b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/request_5375_00.xml new file mode 100644 index 0000000..f860353 --- /dev/null +++ b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/request_5375_00.xml @@ -0,0 +1,20 @@ + + + + + + + + 2008000000000000 + 0000000100000000 + + + + + ASCII + + + + + + diff --git a/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/content.txt b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/content.txt index 3ba89f0..7d3b1f2 100644 --- a/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/content.txt +++ b/test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/content.txt @@ -2,5 +2,6 @@ !2 Listes des anomalies corrigées lors de la Release 1 * [[#4787: generate_param_info for derived params][>ParaminfoDerivedparams]] * [[#4873: spectra : fatal error if no data][>SpectroNodata]] + * [[#5375: header fichier , manque parfois des #][>InfoBreakLine]] ----- !contents -R2 -g -p -f -h diff --git a/test/data/DataBaseParameters/dst_info_break_line.xml b/test/data/DataBaseParameters/dst_info_break_line.xml new file mode 100644 index 0000000..c595548 --- /dev/null +++ b/test/data/DataBaseParameters/dst_info_break_line.xml @@ -0,0 +1,24 @@ + + + + dst + dst + + nT + + 0 + + -1.0e+31 + + ground_based_dst_break_line + + + + + + + + + + + diff --git a/test/data/DataSetInfo/ground_based_dst_break_line.xml b/test/data/DataSetInfo/ground_based_dst_break_line.xml new file mode 100644 index 0000000..fc4a1e2 --- /dev/null +++ b/test/data/DataSetInfo/ground_based_dst_break_line.xml @@ -0,0 +1,15 @@ + + + Dst + Dst dataset from DDServer + CDPP + 1 + 2 + 3600 + + None + CDPP acknowledgement... +Saut de ligne + + indices_ground_based + -- libgit2 0.21.2