CDPP / AMDA_IHM

Commit e43d3d5955f6a904876512421f29cf3c0dc140c9

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

Fix errors when importing files with tabs

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/classes/FilesMgr.php
  Diff comments   View file @e43d3d5
... ... @@ -260,8 +260,8 @@ class FilesMgr extends AmdaObjectMgr
260 260 $handler = fopen($this->fileName, 'r');
261 261 if ($handler) {
262 262 while (!feof($handler) && !$StartTime) {
263   - $oneLine = trim(fgets($handler));
264   - $elems = explode(" ", preg_replace('/\s+/', ' ', $oneLine));
  263 + $oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
  264 + $elems = explode(' ', $oneLine);
265 265 if ((strlen($elems[0]) < 16) || !($time = strtotime($elems[0]))) {
266 266 $i++;
267 267 continue;
... ... @@ -274,7 +274,8 @@ class FilesMgr extends AmdaObjectMgr
274 274  
275 275 if (feof($handler)) return -10;
276 276  
277   - $oneLine = trim(fgets($handler));
  277 + $oneLine = trim(preg_replace('/\s+/', ' ', fgets($handler)));
  278 +
278 279 $elems = explode(" ",$oneLine);
279 280 if (count($elems) < 2) return -10;
280 281  
... ...