CDPP / AMDA_IHM

Commit eefe1e26fcc5357cb4991ea2ca265462d9a8585f

Authored by Nathanaël Jourdane
1 parent efb57954
Exists in master and in 109 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, 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

Improve DOY parsing

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
Inline Side-by-side
php/classes/TimeTableMgr.php
  Diff comments   View file @eefe1e2
@@ -339,7 +339,7 @@ class TimeTableMgr extends AmdaObjectMgr @@ -339,7 +339,7 @@ class TimeTableMgr extends AmdaObjectMgr
339 } else { 339 } else {
340 $isoFormat = 'Y-m-dTH:i:s'; 340 $isoFormat = 'Y-m-dTH:i:s';
341 $doyFormat = 'Y z H i s'; 341 $doyFormat = 'Y z H i s';
342 - $doyRegex = '(\d{4}) (\d{3}) (\d{2}) (\d{2}) (\d{2})'; 342 + $doyRegex = '(\d{4}) (\d{2,3}) (\d{2}) (\d{2}) (\d{2})( \d{2})?';
343 343
344 if (preg_match('/^' . $doyRegex . ' ' . $doyRegex . '$/', $line)) { 344 if (preg_match('/^' . $doyRegex . ' ' . $doyRegex . '$/', $line)) {
345 $startDate = DateTime::createFromFormat($doyFormat, substr($line, 0, 17))->format($isoFormat); 345 $startDate = DateTime::createFromFormat($doyFormat, substr($line, 0, 17))->format($isoFormat);