CDPP / AMDA_IHM

Commit 2ce0aff1dd7d42bb6d8cbf2dbd69bfcb126ff809

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

DD_WSDL defined im my_config

Showing 3 changed files with 13 additions and 15 deletions   Show diff stats
Inline Side-by-side
php/RemoteDataCenter/makeOrbitsInfo.php
  Diff comments   View file @2ce0aff
... ... @@ -13,7 +13,7 @@
13 13  
14 14 $AMDA_IHM = getenv('AMDA_IHM');
15 15 //TBD should be one dir with AmdaUpdate [install] and config
16   - define('WSDL','http://amda-dev.irap.omp.eu/BASE/DDService/dd.wsdl');
  16 + // define('WSDL','http://amda-dev.irap.omp.eu/BASE/DDService/dd.wsdl');
17 17  
18 18 require_once $AMDA_IHM."/php/config.php";
19 19  
... ... @@ -23,7 +23,7 @@
23 23 $tr = array('_' => ':');
24 24  
25 25 try {
26   - $client = new SoapClient(WSDL);
  26 + $client = new SoapClient(DD_WSDL);
27 27 }
28 28 catch (SoapFault $exception) {
29 29 $msg = $exception->faultstring.PHP_EOL;
... ...
php/my_config.php
  Diff comments   View file @2ce0aff
... ... @@ -10,23 +10,17 @@
10 10 define('INTEGRATION_BASE_PATH', '/home/benjamin/AMDA-GIT/AMDA_Integration/');
11 11  
12 12 require_once(INTEGRATION_BASE_PATH.'config/AMDAIntegrationConfig.php');
13   -//
14   -
15   -//AKKA - For compatibility with IHM
16   -define('BASE_PATH', IHM_SRC_DIR);
17   -
18   -define('ROOT_PATH', '/usr/local/AMDA/DDHTML/');
19   -
20   -//AKKA - For compatibility with IHM
21   -define('DDHOME', NEWKERNEL_BASE_PATH.'/build/Debug/');
22 13  
23 14 define('CEFLIB', '/usr/local/cef/lib');
24 15 define('CDFLIB', '/opt/local/lib');
25 16 define('SYS_LIBS', '/lib:/usr/lib:/usr/local/lib64');
26 17 define('SYS_BIN','/bin:/usr/bin/:/usr/local/bin/');
27 18  
  19 +//AKKA - For compatibility with IHM
  20 +define('BASE_PATH', IHM_SRC_DIR);
  21 +
28 22 //DD WebServices
29   -define('INFOSITE', 'http://cdpp1.cesr.fr/BASE/');
  23 +define('INFOSITE', 'http://cdpp.irap.omp.eu/BASE/');
30 24 //log for AmdaUpdate/AmdaInstall
31 25 define('log', IHM_SRC_DIR.'LOG');
32 26 // User apache
... ... @@ -40,8 +34,8 @@ define('email','brenard@irap.omp.eu');
40 34 define('DDBIN','/opt/local/bin/');
41 35 define('DDLIB','/opt/local/lib/');
42 36  
43   -
44   -define('DDPROJECT','AMDA'); //'AMDA'
  37 +// for updateAmda
  38 +define('DD_WSDL','http://amda-dev.irap.omp.eu/BASE/DDService/dd.wsdl');
45 39  
46 40 $is64 = true;
47 41  
... ...
updateAmda
  Diff comments   View file @2ce0aff
... ... @@ -107,9 +107,13 @@
107 107  
108 108 if [ -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ] && [ -e ./LocalParams.xml ]
109 109 then
110   - cp ./LocalParams.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData
  110 + mv ./LocalParams.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData
111 111 fi
112 112 echo 'copy 2 amda : done'
  113 +
  114 + echo "updating OrbitsInfo..."
  115 + php $AMDAINSTALLATION/AMDA_IHM/php/RemoteDataCenter/makeOrbitsInfo.php
  116 + echo "update OrbitsInfo : done"
113 117 fi
114 118  
115 119 if [ $PARAM_INFO ]
... ...