CDPP / AMDA_IHM

Commit f9b34ed907cd2330e1602ea8628b9625410cfcf2

Authored by Nathanaël Jourdane
1 parent ed15f51c
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

import : parse dates with non-standard formats

Showing 1 changed file with 7 additions and 4 deletions   Show diff stats
Inline Side-by-side
php/classes/TimeTableMgr.php
  Diff comments   View file @f9b34ed
... ... @@ -333,13 +333,13 @@ 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 = preg_replace('/[-:\/\s]+/', ' ', trim($line));
337 337 if ($line[0] == '#') { // Comment
338 338 $description = $description . PHP_EOL . substr($line, 1, -1);
339 339 } else {
340 340 $isoFormat = 'Y-m-dTH:i:s';
341 341 $doyFormat = 'Y z H i s';
342   - $doyRegex = '(\d{4}) (\d{2,3}) (\d{2}) (\d{2}) (\d{2})( \d{2})?';
  342 + $doyRegex = '(\d{4}) (\d{3}) (\d{2}) (\d{2}) (\d{2})( \d{2})?';
343 343  
344 344 if (preg_match('/^' . $doyRegex . ' ' . $doyRegex . '$/', $line)) {
345 345 $start = DateTime::createFromFormat($doyFormat, substr($line, 0, 17));
... ... @@ -349,8 +349,11 @@ class TimeTableMgr extends AmdaObjectMgr
349 349 } else {
350 350 $dateLength = round((strlen($line)-1) / 2);
351 351  
352   - $startTime = strtotime(substr($line, 0, $dateLength));
353   - $stopTime = strtotime(substr($line, $dateLength + 1));
  352 + $start = explode(' ', substr($line, 0, $dateLength) . ' 00');
  353 + $startTime = strtotime("$start[0]/$start[1]/$start[2] $start[3]:$start[4]:$start[5]");
  354 +
  355 + $stop = explode(' ', substr($line, $dateLength + 1) . ' 00');
  356 + $stopTime = strtotime("$stop[0]/$stop[1]/$stop[2] $stop[3]:$stop[4]:$stop[5]");
354 357 if (is_numeric($startTime) && is_numeric($stopTime)) {
355 358 $startDate = date($isoFormat, $startTime);
356 359 $stopDate = date($isoFormat, $stopTime);
... ...