Fix #5375 - header fichier , manque parfois des #

Benjamin Renard
1 parent 5fd5fc53
Showing 8 changed files with 191 additions and 1 deletions Show diff stats
src/ParamOutputImpl/Download/FileWriterASCIITabular.cc
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/content.txt
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/download_5375_00_REF.txt
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/properties.xml
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/InfoBreakLine/request_5375_00.xml
test/FitNesseRoot/ReleaseS/TmaAmda/ReLease1/content.txt
test/data/DataBaseParameters/dst_info_break_line.xml
test/data/DataSetInfo/ground_based_dst_break_line.xml
@@ -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*/)
@@ -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
@@ -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
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<properties>
+	<Edit/>
+	<Files/>
+	<Properties/>
+	<Refactor/>
+	<Search/>
+	<Test/>
+	<WhereUsed/>
+</properties>
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<request>
+  <params>
+    <param id='dst_info_break_line'/>
+  </params>
+  <times>
+    <interval>
+      <startTime>2008000000000000</startTime>
+      <timeInterval>0000000100000000</timeInterval>
+    </interval>
+  </times>
+  <outputs>
+    <download>
+      <fileFormat>ASCII</fileFormat>
+      <param id='dst_info_break_line'/>
+    </download>
+  </outputs>  
+</request>
+
+  
@@ -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
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="dst_info_break_line">
+	<info>
+		<name>dst</name>
+		<short_name>dst</short_name>
+		<components></components>
+		<units>nT</units>
+		<coordinates_system></coordinates_system>
+		<tensor_order>0</tensor_order>
+		<si_conversion></si_conversion>
+		<fill_value>-1.0e+31</fill_value>
+		<ucd></ucd>
+		<dataset_id>ground_based_dst_break_line</dataset_id>		
+	</info>
+	<get>
+		<vi name="ground:based:dst">
+			<baseParam name="DST">
+
+			</baseParam>
+		</vi>
+	</get>
+	<process />
+	<output />
+</param>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dataset xml:id="ground_based_dst_break_line">
+    <name>Dst</name>
+    <description>Dst dataset from DDServer</description>
+    <source>CDPP</source>
+    <global_start>1</global_start>
+    <global_stop>2</global_stop>
+    <min_sampling>3600</min_sampling>
+    <max_sampling></max_sampling>
+    <caveats>None</caveats>
+    <acknowledgement>CDPP acknowledgement...
+Saut de ligne
+</acknowledgement>
+    <instrument_id>indices_ground_based</instrument_id>
+</dataset>