CDPP / AMDA_IHM

Commit 0a18b1cf0a7ee96a7ab362f86370d2b41a88f1d8

Authored by Elena.Budnik
1 parent 2ce0aff1
Exists in master and in 112 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, install-rework, livraison-akka, 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

bug while IMPEX adding

Showing 1 changed file with 7 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/classes/BaseManager.php
  Diff comments   View file @0a18b1c
... ... @@ -103,14 +103,15 @@ class BaseManager
103 103 */
104 104 public function addFile($fileName, $start = null, $stop = null)
105 105 {
106   - // standard file upload : start / stop get from file
  106 +
  107 + // standard file upload : start / stop get from file
107 108 if (!$start)
108 109 {
109 110 $fileDom = new DomDocument("1.0");
110 111 $fileDom->load($this->fileDomName);
111 112 $file = $fileDom->getElementById($fileName);
112 113 $start = $file->getAttribute('start');
113   - $stop = $file->getAttribute('stop');
  114 + $stop = $file->getAttribute('stop');
114 115 }
115 116  
116 117 $lastMask = null;
... ... @@ -280,7 +281,10 @@ class BaseManager
280 281 $newVi->appendChild($this->baseDom->createElement("mask",$fileMask));
281 282 $this->appendFiles($newVi, $fileMask);
282 283  
283   - $this->baseDom->documentElement->appendChild($newVi);
  284 + $this->baseDom->documentElement->appendChild($newVi);
  285 +
  286 + /* SORT files by Start Time */
  287 + $this->xslt->transformToDoc($this->baseDom)->save($this->baseDomName);
284 288 return $newId;
285 289 }
286 290  
... ...