CDPP / AMDA_IHM

Commit 39b3dd7056823add4f8053d20a2b2bf42327d450

Authored by Elena.Budnik
1 parent ae3373c4
Exists in master and in 100 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Megan bug : no z definition in time format

Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
Inline Side-by-side
php/classes/FilesMgr.php
  Diff comments   View file @39b3dd7
... ... @@ -435,6 +435,7 @@ class FilesMgr extends AmdaObjectMgr
435 435 protected function reformatTime($timeFormat, $timeLength, $doy)
436 436 {
437 437 $formatLength = $timeLength == 'auto' ? strlen($timeFormat) + (strpos($timeFormat,"Y") !== false)*3 + (strpos($timeFormat,"y") !== false)
  438 + + (strpos($timeFormat,"z") !== false)*2
438 439 + (strpos($timeFormat,"M") !== false)*2 + (strpos($timeFormat,"m") !== false)
439 440 + (strpos($timeFormat,"d") !== false) + (strpos($timeFormat,"H") !== false)
440 441 + (strpos($timeFormat,"i") !== false) + (strpos($timeFormat,"s") !== false)
... ... @@ -471,6 +472,7 @@ class FilesMgr extends AmdaObjectMgr
471 472 if (!$date)
472 473 {
473 474 if (strpos($oneLine,'#') === 0) fwrite($newfile, $oneLine.PHP_EOL);
  475 + else return false;
474 476 }
475 477 else
476 478 {
... ... @@ -484,7 +486,7 @@ class FilesMgr extends AmdaObjectMgr
484 486 }
485 487 catch (Exception $e)
486 488 {
487   - // fwrite($newfile,$line.PHP_EOL);
  489 + return false;
488 490 }
489 491 }
490 492 else
... ...