CDPP / AMDA_IHM

Commit f8315d1b379c6254954076bc5ae4879a279e909a

Authored by Elena.Budnik
1 parent 605e4bfd
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

modif env vars according to AMDA_Install

Showing 1 changed file with 5 additions and 6 deletions   Show diff stats
Inline Side-by-side
update_amda/makeTree.php
  Diff comments   View file @f8315d1
... ... @@ -5,15 +5,14 @@
5 5 */
6 6  
7 7 error_reporting(E_ERROR);
8   - define("AMDA_SPASE_INTERFACE", getenv("AMDA_SPASE_INTERFACE"));
9 8  
10   - if ( AMDA_SPASE_INTERFACE == "" )
  9 + if (getenv("AMDA_SPASE_INTERFACE") === false)
11 10 require_once("./config.php");
12 11 else
13   - require_once(AMDA_SPASE_INTERFACE."/config.php");
14   -
15   - if (defined("DATAPATH") && file_exists(DATAPATH.'rank.json'))
16   - $cmpArr = json_decode(file_get_contents(DATAPATH.'rank.json'), true);
  12 + require_once(getenv("AMDA_SPASE_INTERFACE")."/config.php");
  13 +
  14 + if (getenv("DATAPATH") !== false && file_exists(getenv("DATAPATH")."rank.json"))
  15 + $cmpArr = json_decode(file_get_contents(getenv("DATAPATH")."rank.json"), true);
17 16 else
18 17 $cmpArr = null;
19 18  
... ...