CDPP / AMDA_Integration

Commit a51cd0e901f0e0684b2caf4d2b44f54a354fe139

Authored by Benjamin Renard
1 parent cd28a380
Exists in master and in 59 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, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, sum-components-indexes, test-merge, ws_get_catalog

rm ok

Showing 3 changed files with 11 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/DownloadImpl/IHMInputOutputParamsDownloadClass.php
  Diff comments   View file @a51cd0e
@@ -56,6 +56,13 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas @@ -56,6 +56,13 @@ class IHMInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClas
56 case 'Timestamp' : 56 case 'Timestamp' :
57 $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::TIMESTAMP); 57 $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::TIMESTAMP);
58 break; 58 break;
  59 + case 'Timestamp-with-milliseconds' :
  60 + $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::MS);
  61 + break;
  62 + case 'YYYY MM DD hh mm ss' :
  63 + $downloadNode->setTimeFormat(RequestOutputDownloadTimeFormatEnum::SPACES);
  64 + break;
  65 +
59 default : 66 default :
60 throw new Exception('Time format not implemented.'); 67 throw new Exception('Time format not implemented.');
61 } 68 }
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputDownloadNodeClass.php
  Diff comments   View file @a51cd0e
@@ -22,6 +22,8 @@ abstract class RequestOutputDownloadTimeFormatEnum @@ -22,6 +22,8 @@ abstract class RequestOutputDownloadTimeFormatEnum
22 const ISO = "ISO"; 22 const ISO = "ISO";
23 const DDTIME = "DD"; 23 const DDTIME = "DD";
24 const TIMESTAMP = "DOUBLE"; 24 const TIMESTAMP = "DOUBLE";
  25 + const SPACES = "SPACES";
  26 + const MS = "MS";
25 } 27 }
26 28
27 abstract class RequestOutputDownloadFileFormatEnum 29 abstract class RequestOutputDownloadFileFormatEnum
src/Request/ProcessRequestImpl/Process/ProcessClass.php
  Diff comments   View file @a51cd0e
@@ -215,8 +215,8 @@ class ProcessClass @@ -215,8 +215,8 @@ class ProcessClass
215 if (!chdir($this->runningPath)) 215 if (!chdir($this->runningPath))
216 return false; 216 return false;
217 217
218 - if (!$keep_log && file_exists($this->outputFile))  
219 - unlink($this->outputFile); 218 + //if (!$keep_log && file_exists($this->outputFile))
  219 + // unlink($this->outputFile);
220 220
221 if (file_exists($this->exitCodeFile)) 221 if (file_exists($this->exitCodeFile))
222 unlink($this->exitCodeFile); 222 unlink($this->exitCodeFile);