CDPP / AMDA_Integration

Commit 6139c32c2434b5eec34def9edfed087712ea0718

Authored by Benjamin Renard
1 parent b4950fd0
Exists in master and in 62 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, ws_get_catalog

Give the possibility to put header in a separate file (#6497)

Showing 2 changed files with 17 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php
  Diff comments   View file @6139c32
... ... @@ -15,7 +15,7 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
15 15 */
16 16 protected function unmarshallRequest($input)
17 17 {
18   - //{"nodeType":"download","type":"Download","downloadSrc":"0","structure":"2","sampling":600,"output":"",
  18 + //{"nodeType":"download","type":"Download","downloadSrc":"0","structure":"2","sampling":600,"separateInfoFile":false,"output":"",
19 19 // "header":"0","timesrc":"TimeTable","timeTables":[{"timeTableName":"rzerzer","id":"tt_1"},{"timeTableName":"sqsdq","id":"tt_0"}],
20 20 //"list":["dst"],"milli":false,"fileformat":"ASCII","timeformat":"YYYY-MM-DDThh:mm:ss","compression":"tar+gzip","leaf":true}
21 21  
... ... @@ -121,6 +121,9 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
121 121 throw new Exception('Structure type not implemented.');
122 122 }
123 123  
  124 + //separateInfoFile
  125 + $downloadNode->setSeparateInfoFile(isset($input->separateInfoFile) ? $input->separateInfoFile : FALSE);
  126 +
124 127 //filecompressData : [['zip', 'zip'], ['tar+gzip', 'tar+gzip']],
125 128 $extension = "";
126 129 $resultFilePrefix = "";
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php
  Diff comments   View file @6139c32
... ... @@ -8,6 +8,7 @@ define ("REQUESTOUTPUTDOWNLOAD_FILEFORMAT", "fileFormat");
8 8 define ("REQUESTOUTPUTDOWNLOAD_FILENAME", "fileName");
9 9 define ("REQUESTOUTPUTDOWNLOAD_SAMPLING", "timeResolution");
10 10 define ("REQUESTOUTPUTDOWNLOAD_STRUCTURE", "outputStructure");
  11 +define ("REQUESTOUTPUTDOWNLOAD_SEPARATEINFOGILE", "separateInfoFile");
11 12 define ("REQUESTOUTPUTDOWNLOAD_PRECISION", "precision");
12 13  
13 14 define ("REQUESTOUTPUTDOWNLOADPARAM_NAME", "param");
... ... @@ -199,6 +200,18 @@ class RequestOutputDownloadNodeClass extends NodeClass
199 200 return (($node == NULL) ? RequestOutputDownloadStructureEnum::UNKNOWN : $node->getValue());
200 201 }
201 202  
  203 + public function setSeparateInfoFile($separateInfoFile)
  204 + {
  205 + $node = $this->getChildInstanceByName(REQUESTOUTPUTDOWNLOAD_STRUCTURE, true);
  206 + $node->setAttribute(REQUESTOUTPUTDOWNLOAD_SEPARATEINFOGILE, $separateInfoFile ? "true" : "false");
  207 + }
  208 +
  209 + public function getSeparateInfoFile()
  210 + {
  211 + $node = $this->getChildInstanceByName(REQUESTOUTPUTDOWNLOAD_STRUCTURE);
  212 + return (($node == NULL) ? FALSE : ($node->getAttribute(REQUESTOUTPUTDOWNLOAD_SEPARATEINFOGILE) == "true"));
  213 + }
  214 +
202 215 public function setPrecision($precision)
203 216 {
204 217 $this->setAttribute(REQUESTOUTPUTDOWNLOAD_PRECISION, $precision);
... ...