CDPP / AMDA_IHM

Commit 1f0e5c7d47dbc1cb33d1671384ae1aa26cc5ff5e

Authored by Myriam Bouchemit
2 parents 38170a0a bea3673d
Exists in master and in 110 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
Inline Side-by-side
php/classes/TimeTableMgr.php
  Diff comments   View file @1f0e5c7
... ... @@ -333,10 +333,11 @@ class TimeTableMgr extends AmdaObjectMgr
333 333 $descNumber = 0;
334 334  
335 335 foreach ($lines as $line) {
336   - $line = preg_replace('/[-:\/\s]+/', ' ', trim($line));
  336 + $line = trim($line);
337 337 if ($line[0] == '#') { // Comment
338 338 $description = $description . PHP_EOL . substr($line, 1, -1);
339 339 } else {
  340 + $line = preg_replace('/[-:\/T\s]+/', ' ', $line);
340 341 $isoFormat = 'Y-m-dTH:i:s';
341 342 $doyFormat = 'Y z H i s';
342 343 $doyRegex = '(\d{4}) (\d{3}) (\d{2}) (\d{2}) (\d{2})( \d{2})?';
... ...