CDPP / AMDA_IHM

Commit f417c7623777b3454f96dd20f5a9a3611bb38001

Authored by Elena.Budnik
1 parent fe7f8a62
Exists in master and in 111 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, 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

correcte path

Showing 1 changed file with 6 additions and 3 deletions   Show diff stats
Inline Side-by-side
php/makeOrbitsList.php
  Diff comments   View file @f417c76
... ... @@ -4,11 +4,14 @@
4 4 * Uses LocalParams.xml and AMDA params descriptions
5 5 */
6 6  
7   - $AMDA_IHM = getenv('AMDA_IHM');
  7 + $AMDA_IHM = getenv('AMDA_IHM');
8 8  
9   - require_once $AMDA_IHM."/config.php";
  9 + if (!isset($AMDA_IHM))
  10 + require_once __DIR__."/config.php";
  11 + else
  12 + require_once $AMDA_IHM."/php/config.php";
10 13  
11   - if (!defined('orbitsXml'))
  14 + if (!defined('orbitsXml'))
12 15 exit("orbitsXml is not defined in config.php".PHP_EOL);
13 16  
14 17 $pairs = array("-" => "_" );
... ...