CDPP / AMDA_IHM

Commit 415ff5560f8f9a8f2d8b9ed5d45c6718cea3f14c

Authored by Elena.Budnik
2 parents ef2dedb3 2b8ea2a7
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

Merge branch 'master' into fix-folders-fix-merge

Showing 2 changed files with 37 additions and 17 deletions   Show diff stats
Inline Side-by-side
php/RemoteDataCenter/RemoteParamManager.php
  Diff comments   View file @415ff55
... ... @@ -6,7 +6,7 @@
6 6  
7 7 class RemoteParamManager
8 8 {
9   - protected $Bases, $basesDom;
  9 + public $Bases, $basesDom;
10 10 protected $baseDom;
11 11  
12 12 protected $center;
... ... @@ -16,31 +16,41 @@ class RemoteParamManager
16 16  
17 17 function __construct()
18 18 {
  19 + $this->basesDom = new DomDocument("1.0");
  20 +
  21 + if (!is_dir(RemoteData."/PARAMS"))
  22 + mkdir(RemoteData."/PARAMS", 0775, true);
  23 +
  24 + if (!is_dir(RemoteData."/PARAMS_INFO"))
  25 + mkdir(RemoteData."/PARAMS_INFO", 0775, true);
  26 +
  27 + $this->xmlName = USERWSDIR."RemoteParams.xml";
  28 + $this->xmlDom = new DomDocument("1.0");
  29 +
  30 + }
  31 +
  32 + public function init() {
  33 +
19 34 if (!file_exists(RemoteData."Bases.xml"))
20 35 return array("err" => "No Remote Data Bases");
21   -
22   - $this->basesDom = new DomDocument("1.0");
  36 +
23 37 if (!$this->basesDom->load(RemoteData."Bases.xml"))
24 38 return array("err" => "Can not load Remote Data Bases definitions");
  39 +
25 40 $bases = $this->basesDom->getElementsByTagName('dataCenter');
26 41  
27 42 foreach ($bases as $base)
28 43 $this->Bases[] = $base->getAttribute('xml:id');
29   -
  44 +
30 45 if (!file_exists(USERWSDIR."RemoteParams.xml"))
31   - return array("err" => "No RemoteParams.xml");
  46 + return array("err" => "RemoteParams file error");
32 47  
33   - if (!is_dir(RemoteData."/PARAMS"))
34   - mkdir(RemoteData."/PARAMS", 0775, true);
35   -
36   - if (!is_dir(RemoteData."/PARAMS_INFO"))
37   - mkdir(RemoteData."/PARAMS_INFO", 0775, true);
38   -
39   - $this->xmlName = USERWSDIR."RemoteParams.xml";
40   - $this->xmlDom = new DomDocument("1.0");
41   - $this->xmlDom->load($this->xmlName);
  48 + if (!$this->xmlDom->load($this->xmlName))
  49 + return array("err" => "RemoteParams file error");
  50 +
  51 + return array("success" => true);
42 52 }
43   -
  53 +
44 54 /*
45 55 * get baseId from parameter descriptor
46 56 */
... ...
php/classes/AmdaAction.php
  Diff comments   View file @415ff55
... ... @@ -572,7 +572,12 @@ class AmdaAction
572 572 public function saveTree($obj)
573 573 {
574 574 $paramMgr = new RemoteParamManager();
575   - return $paramMgr->saveTree($obj);
  575 + $res = $paramMgr->init();
  576 +
  577 + if ($res['success'])
  578 + return $paramMgr->saveTree($obj);
  579 + else
  580 + return $res;
576 581 }
577 582  
578 583 /*
... ... @@ -581,7 +586,12 @@ class AmdaAction
581 586 public function deleteFromTree($obj)
582 587 {
583 588 $paramMgr = new RemoteParamManager();
584   - return $paramMgr->deleteFromTree($obj);
  589 + $res = $paramMgr->init();
  590 +
  591 + if ($res['success'])
  592 + return $paramMgr->deleteFromTree($obj);
  593 + else
  594 + return $res;
585 595 }
586 596  
587 597 public function doNothing($obj)
... ...