CDPP / AMDA_IHM

Commit 99ae8744d2315867ef4512d519d58dc7c5a759af

Authored by Benjamin Renard
1 parent 5310339a
Exists in master and in 110 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, 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

Use config variables in upda_amda scripts

Showing 24 changed files with 235 additions and 159 deletions   Show diff stats
Inline Side-by-side
php/RemoteDataCenter/RemoteDataCenterClass.php
  Diff comments   View file @99ae874
... ... @@ -90,7 +90,8 @@ abstract class RemoteDataCenterClass
90 90 $ch = curl_init($this->url."/".$this->WSDL);
91 91 curl_setopt($ch, CURLOPT_TIMEOUT, 3);
92 92 curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
93   - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
  93 + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
  94 + ProxyUtils::addProxyForCurl($ch);
94 95 $data = curl_exec($ch);
95 96 $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
96 97 curl_close($ch);
... ...
php/classes/UserMgr.php
  Diff comments   View file @99ae874
... ... @@ -658,7 +658,7 @@ unlink(USERWSDIR.'RemoteParams.xml');
658 658 {
659 659 if (file_exists(USERWSDIR.'LocalParams.xml'))
660 660 unlink(USERWSDIR.'LocalParams.xml');
661   - if (!copy(DATAPATH.'/LocalData/LocalParams.xml', USERWSDIR.'LocalParams.xml'))
  661 + if (!copy(LocalData.'/LocalParams.xml', USERWSDIR.'LocalParams.xml'))
662 662 die("Login for ".$this->user." failed: Can't copy LocalParams.xml");
663 663  
664 664 if ($this->userGrps)
... ...
php/config.php
  Diff comments   View file @99ae874
... ... @@ -71,8 +71,15 @@ ini_set('user_agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:7.0) Gecko/201
71 71 define('DATAPATH', IHM_SRC_DIR.'generic_data/');
72 72 //define('Param', DATAPATH.'Param/');
73 73 define('LocalData', DATAPATH.'LocalData/');
  74 +define('PARAMS_LOCALDB_DIR', LocalData.'ParamDef/');
  75 +define('PARAMS_LOCALINFO_DIR', LocalData.'ParamInfo/');
  76 +define('ParamTemplate', LocalData.'ParamTemplate/');
  77 +define('MissionInfo', LocalData.'MissionInfo');
  78 +define('InstrumentInfo', LocalData.'InstrumentInfo');
  79 +define('DataSetInfo', LocalData.'DataSetInfo/');
74 80 define('RemoteData', DATAPATH.'RemoteData/');
75 81 define('Functions', DATAPATH.'Functions/');
  82 +define('HelpAuto', DATAPATH.'help/auto/');
76 83 //define('Plot', DATAPATH.'Plot/');
77 84 define('Hst', DATAPATH.'Hst/');
78 85 define('SpecialSettingsDir',DATAPATH.'SpecialSettings/');
... ... @@ -109,8 +116,8 @@ define('wsdl_AMDA', webAlias."public/wsdl/Methods_AMDA.wsdl");
109 116  
110 117 define('DD_WSDL',DDSERVICE.'/dd.wsdl');
111 118  
112   -putenv("LD_LIBRARY_PATH=".COTS_BASE_DIR."/lib:/lib:/usr/local/lib:/usr/local/lib64");
113   -putenv("PATH=./:".COTS_BASE_DIR."/bin:/bin:/usr/bin:/usr/local/bin:".IHM_SRC_DIR."/php/bin");
  119 +putenv("LD_LIBRARY_PATH=".COTS_BASE_DIR."/lib:".GCC_BASE_DIR."/lib:".GCC_BASE_DIR."/lib64:"."/lib:/usr/local/lib:/usr/local/lib64");
  120 +putenv("PATH=./:".COTS_BASE_DIR."/bin:".GCC_BASE_DIR."/bin:"."/bin:/usr/bin:/usr/local/bin:".IHM_SRC_DIR."/php/bin");
114 121  
115 122 putenv("DDPATH=".DDRES_DIR);
116 123 define('XMLPATH', IHM_SRC_DIR.'php/XML/');
... ...
php/getEnv.php
  Diff comments   View file @99ae874
... ... @@ -8,12 +8,22 @@ $variables = array(
8 8 'AMDA_SPASE_INTERFACE',
9 9 'NEWMETA',
10 10 'AMDAINTERNALDIR',
11   - 'AMDAINSTALLATION',
  11 + 'AMDA_KERNEL_DIR',
12 12 'COTS_BASE_DIR',
13 13 'KERNEL_BUILD_TYPE',
14 14 'PROXY_HOST',
15 15 'PROXY_USERPWD',
16 16 'DD_WSDL',
  17 + 'DATAPATH',
  18 + 'PARAMS_LOCALINFO_DIR',
  19 + 'PARAMS_LOCALDB_DIR',
  20 + 'LocalData',
  21 + 'ParamTemplate',
  22 + 'MissionInfo',
  23 + 'InstrumentInfo',
  24 + 'DataSetInfo',
  25 + 'HelpAuto',
  26 + 'RemoteData',
17 27 );
18 28  
19 29 foreach ($variables as $variable) {
... ...
php/makeOrbits deleted
View file @5310339
... ... @@ -1,10 +0,0 @@
1   -#!/bin/bash
2   -
3   -#
4   -#
5   -#
6   -
7   - if [ -z ${AMDA_IHM+x} ]; then export AMDA_IHM=./..; fi
8   -
9   - php $AMDA_IHM/php/makeOrbitsList.php
10   - php $AMDA_IHM/php/makeOrbitsInKm.php
11 0 \ No newline at end of file
php/makeOrbitsInKm.php
  Diff comments   View file @99ae874
... ... @@ -22,7 +22,7 @@
22 22 if (!file_exists(orbitsXml))
23 23 exit("No orbitsXml file".PHP_EOL);
24 24  
25   - $amdaParamDir = DATAPATH."newKernelDDBase";
  25 + $amdaParamDir = PARAMS_LOCALDB_DIR;
26 26  
27 27 $dom = new DomDocument("1.0");
28 28 $dom->load(orbitsXml);
... ... @@ -125,4 +125,4 @@
125 125 $dom->save(LocalData.'OrbitsAll.xml');
126 126 ?>
127 127  
128   -
129 128 \ No newline at end of file
  129 +
... ...
php/makeOrbitsList.php
  Diff comments   View file @99ae874
... ... @@ -18,11 +18,11 @@
18 18 $pairs = array("-" => "_" );
19 19  
20 20 $amdaXml = new DomDocument("1.0");
21   - $amdaXml->load(DATAPATH."LocalData/LocalParams.xml");
  21 + $amdaXml->load(LocalData."/LocalParams.xml");
22 22  
23 23 $xpath = new DOMXpath($amdaXml);
24 24  
25   - $amdaParamDir = DATAPATH."newKernelDDBase";
  25 + $amdaParamDir = PARAMS_LOCALDB_DIR;
26 26  
27 27 $orbitsXml = new DomDocument("1.0");
28 28 $orbitsXml->formatOutput = TRUE;
... ...
php/makeRemote deleted
View file @5310339
... ... @@ -1,22 +0,0 @@
1   -#!/bin/bash
2   -
3   -#
4   -#
5   -#
6   - if [ -z ${AMDA_IHM+x} ]; then export AMDA_IHM=./..; fi
7   -
8   - # check if Orbites.xml exists; if not create it !
9   - if [ ! -e $AMDA_IHM/generic_data/LocalData/OrbitsAll.xml ]; then
10   - php $AMDA_IHM/php/makeOrbitsList.php
11   - php $AMDA_IHM/php/makeOrbitsInKm.php
12   - fi
13   -
14   - # make Proxies for 'isSimulation' dataCenters from Bases.xml
15   - php $AMDA_IHM/php/RemoteDataCenter/makeProxy.php
16   -
17   - # make [TARGET].json
18   - php $AMDA_IHM/php/RemoteDataCenter/makeOrbitsArgs.php
19   -
20   - # make template args
21   - php $AMDA_IHM/php/RemoteDataCenter/makeArgs.php
22   -
23 0 \ No newline at end of file
php/my_config.php
  Diff comments   View file @99ae874
... ... @@ -24,7 +24,11 @@ define('TITLE', 'AMDANEW-Test');
24 24 define('MAX_UPLOADED_FILESIZE',30000000); // in bytes !!!
25 25  
26 26 // To define only if you are behind a proxy
27   -define('PROXY_HOST','and-fgt-ha.akka.eu:9090');
28   -define('PROXY_USERPWD','benjamin.renard:Ocu4teickpa&da');
  27 +#define('PROXY_HOST','and-fgt-ha.akka.eu:9090');
  28 +#define('PROXY_USERPWD','benjamin.renard:Ocu4teickpa&da');
  29 +
  30 +define('NEWMETA', '/home/brenard/AMDA-GIT/NEWMETA');
  31 +define('AMDA_SPASE_INTERFACE', '/home/brenard/AMDA-GIT/AMDA_SPASE_INTERFACE');
  32 +define('AMDAINTERNALDIR', '/home/brenard/AMDA-GIT/AMDA_INTERNAL_METADATA');
29 33  
30 34 ?>
... ...
php/src/Makefile
  Diff comments   View file @99ae874
1   -INC = -I/usr/include -I/usr/local/include -I/opt/local/include -I/opt/local/include/DDClientLibC
2   -LIB = -L/usr/lib64 -L/usr/local/lib64 -L/opt/local/lib -L/opt/local/lib
  1 +INC = -I/usr/include -I/usr/local/include -I${COTS_BASE_DIR}/include -I${COTS_BASE_DIR}/include/DDClientLibC
  2 +LIB = -L/usr/lib64 -L/usr/local/lib64 -L${COTS_BASE_DIR}/lib
3 3 CFLAGS = -ggdb -DLINUX -m64 -march=core2 -fPIC -Dlinux -D_REENTRANT -malign-double
4 4 CC = gcc
5 5  
... ...
scripts/install-scripts.sh
  Diff comments   View file @99ae874
... ... @@ -4,7 +4,7 @@
4 4  
5 5 SCRIPT=$(readlink -f "$0")
6 6 export SCRIPTDIR=$(dirname "$SCRIPT")
7   -export AMDAINSTALLATION="$SCRIPTDIR/../.."
  7 +export AMDA_IHM="$SCRIPTDIR/.."
8 8 . $SCRIPTDIR/loadEnv.sh
9 9 cd $AMDA_IHM/php/src && make clean && make && make install && make clean
10 10  
... ...
scripts/loadEnv.sh
  Diff comments   View file @99ae874
1 1 #!/bin/bash
2 2  
3   -if [[ $_ != $0 ]]; then
4   - #Script is being sourced
5   - if [[ -z "${AMDAINSTALLATION}" ]]; then
6   - echo "[ERROR] AMDAINSTALLATION not defined"
7   - fi
8   -else
9   - #Script is a subshell
10   - SCRIPT=$(readlink -f "$0")
11   - SCRIPTDIR=$(dirname "$SCRIPT")
12   - export AMDAINSTALLATION=$SCRIPTDIR/..
  3 +if [[ -z "${AMDA_IHM}" ]]; then
  4 + echo "[ERROR] AMDA_IHM not defined"
13 5 fi
14 6  
15   -if [ ! -z "$AMDAINSTALLATION" ]; then
16   - export AMDA_IHM=$AMDAINSTALLATION"/AMDA_IHM"
17   - eval $(php $AMDAINSTALLATION"/AMDA_IHM/php/getEnv.php")
  7 +if [ ! -z "$AMDA_IHM" ]; then
  8 + eval $(php "$AMDA_IHM/php/getEnv.php")
18 9 fi
19 10  
... ...
update_amda/cleanExistingInstallation
  Diff comments   View file @99ae874
1 1 #!/bin/bash
2 2  
3   -if test $AMDAINSTALLATION/AMDA_IHM/generic_data
  3 +SCRIPT=$(readlink -f "$0")
  4 +export UPDATEDIR=$(dirname "$SCRIPT")
  5 +. $UPDATEDIR/updateEnv.sh
  6 +
  7 +if [ -z ${DATAPATH} ]
  8 +then
  9 + echo "[ERROR] check if DATAPATH directory exists"
  10 + exit 1
  11 +fi
  12 +
  13 +if [ -d "$DATAPATH" ]
4 14 then
5   - rm $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo/*.xml
6   - rm $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo/*.xml
7   - rm $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo/*.xml
8   - rm $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo/*.xml
9   - rm $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate/*.xml
10   - rm $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase/*.xml
  15 + rm -f $MissionInfo/*.xml
  16 + rm -f $InstrumentInfo/*.xml
  17 + rm -f $DataSetInfo/*.xml
  18 + rm -f $PARAMS_LOCALINFO_DIR/*.xml
  19 + rm -f $ParamTemplate/ParamTemplate/*.xml
  20 + rm -f $PARAMS_LOCALDB_DIR/*.xml
11 21 else
12   - echo "check if AMDA_IHM/generic_data directory exists"
  22 + echo "[WARNING] check if AMDA_IHM/generic_data directory exists"
13 23 fi
14 24  
15   -if test $AMDAINSTALLATION/AMDA_IHM/generic_data/help/auto
  25 +if [ -d "$HelpAuto" ]
16 26 then
17   - rm $AMDAINSTALLATION/AMDA_IHM/help/auto/*
18   - rm $AMDAINSTALLATION/AMDA_IHM/help/auto/img/*
  27 + rm -rf $HelpAuto/img
  28 + rm -f $HelpAuto/*
19 29 fi
20 30  
21   -if test $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo
  31 +if [ -d "$AMDA_KERNEL_DIR/app-generate-paraminfo" ]
22 32 then
23   - rm -r $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo/src/*
24   - rm $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo/lib/*
  33 + rm -rf $AMDA_KERNEL_DIR/app-generate-paraminfo/src/*
  34 + rm -f $AMDA_KERNEL_DIR/app-generate-paraminfo/lib/*
25 35 else
26   - "check if AMDA_Kernel/app-generate-paraminfo directory exists"
27   -fi
28 36 \ No newline at end of file
  37 + echo "[WARNING] check if AMDA_Kernel/app-generate-paraminfo directory exists"
  38 +fi
... ...
update_amda/cleanNewMetaLight
  Diff comments   View file @99ae874
1 1 #!/bin/bash
2 2  
3   -if test $NEWMETA
  3 +SCRIPT=$(readlink -f "$0")
  4 +export UPDATEDIR=$(dirname "$SCRIPT")
  5 +. $UPDATEDIR/updateEnv.sh
  6 +
  7 +if [ -z ${NEWMETA} ]
  8 +then
  9 + echo "[ERROR] check if NEWMETA env variable is defined"
  10 + exit 1
  11 +fi
  12 +
  13 +if [ -z ${AMDA_SPASE_INTERFACE} ]
  14 +then
  15 + echo "[ERROR] check if AMDA_SPASE_INTERFACE env variable is defined"
  16 + exit 1
  17 +fi
  18 +
  19 +if [ -d "$NEWMETA" ]
4 20 then
5 21  
6 22 for Dir in $(find -L $NEWMETA/* -type d -not -path $NEWMETA/ParamInfo* )
7 23 do
8   - rm ${Dir}/*
  24 + rm -f ${Dir}/*
9 25 done
  26 +else
  27 + echo "[ERROR] NEWMETA dir not exists"
  28 +fi
10 29  
11   - rm $AMDA_SPASE_INTERFACE/SPASE/*
  30 +if [ -d "$AMDA_SPASE_INTERFACE" ]
  31 +then
  32 + rm -f $AMDA_SPASE_INTERFACE/SPASE/*
12 33 else
13   - echo "NEWMETA env var is not defined - source env.sh"
  34 + echo "[ERROR] AMDA_SPASE_INTERFACE env var is not defined"
14 35 fi
... ...
update_amda/cleanNewMetaParamInfo
  Diff comments   View file @99ae874
1 1 #!/bin/bash
2 2  
3   -if test $NEWMETA
  3 +SCRIPT=$(readlink -f "$0")
  4 +export UPDATEDIR=$(dirname "$SCRIPT")
  5 +. $UPDATEDIR/updateEnv.sh
  6 +
  7 +if [ -z ${NEWMETA} ]
  8 +then
  9 + echo "[ERROR] check if NEWMETA env variable is defined"
  10 + exit 1
  11 +fi
  12 +
  13 +if [ -d "$NEWMETA" ]
4 14 then
5 15 for Dir in $(find -L $NEWMETA/ParamInfo -type d)
6 16 do
7   - rm ${Dir}/*
  17 + rm -f ${Dir}/*
8 18 done
9 19  
10 20 else
11   - echo "NEWMETA env var is not defined - source env.sh"
  21 + echo "[ERROR] NEWMETA env var is not defined"
12 22 fi
... ...
update_amda/cp2amda
  Diff comments   View file @99ae874
1 1 #!/bin/bash
2 2  
  3 +SCRIPT=$(readlink -f "$0")
  4 +export UPDATEDIR=$(dirname "$SCRIPT")
  5 +. $UPDATEDIR/updateEnv.sh
  6 +
3 7 # copy all info files
4   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo ]; then
5   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo
  8 +if [ ! -d "$DataSetInfo" ]; then
  9 + mkdir $DataSetInfo
6 10 fi
7   -cp $NEWMETA/datasets/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo
  11 +cp -f $NEWMETA/datasets/*.xml $DataSetInfo
8 12  
9   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo ]; then
10   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo
  13 +if [ ! -d $InstrumentInfo ]; then
  14 + mkdir $InstrumentInfo
11 15 fi
12   -cp $NEWMETA/instruments/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo
  16 +cp -f $NEWMETA/instruments/*.xml $InstrumentInfo
13 17  
14   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo ]; then
15   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo
  18 +if [ ! -d $MissionInfo ]; then
  19 + mkdir $MissionInfo
16 20 fi
17   -cp $NEWMETA/missions/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo
  21 +cp -f $NEWMETA/missions/*.xml $MissionInfo
18 22  
19 23 # copy all Templates if exist
20   -if [ -e $AMDAINTERNALDIR/ParamTemplateList.xml ]; then
21   - if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate ]; then
22   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate
  24 +if [ -f "$AMDAINTERNALDIR/ParamTemplateList.xml" ]; then
  25 + if [ ! -d "$ParamTemplate" ]; then
  26 + mkdir $ParamTemplate
23 27 fi
24 28  
25   - php ./mvTemplates.php
26   - cp $AMDAINTERNALDIR/ParamTemplateList.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate
  29 + php $UPDATEDIR/mvTemplates.php
  30 + cp $AMDAINTERNALDIR/ParamTemplateList.xml $ParamTemplate
27 31 fi
28 32  
29 33 # copy all parameter desctiptions
30   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase ]; then
31   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
  34 +if [ ! -d "$PARAMS_LOCALDB_DIR" ]; then
  35 + mkdir $PARAMS_LOCALDB_DIR
32 36 fi
33   -cp $NEWMETA/final/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
  37 +cp $NEWMETA/final/*.xml $PARAMS_LOCALDB_DIR
34 38  
35 39 # if internal parameters not shown in the tree exist => copy them to AMDA Installation without processing
36   -if [ -d $AMDAINTERNALDIR/INTERNAL_PARAM_DEF ]; then
37   - cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/* $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
  40 +if [ -d "$AMDAINTERNALDIR/INTERNAL_PARAM_DEF" ]; then
  41 + cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/* $PARAMS_LOCALDB_DIR
38 42 fi
39 43  
40 44 # if special help exitsts => copy it to NEWMETA
41   -if [ -d $AMDAINTERNALDIR/HELP_PREDEFINED ]; then
  45 +if [ -d "$AMDAINTERNALDIR/HELP_PREDEFINED" ]; then
42 46 cp $AMDAINTERNALDIR/HELP_PREDEFINED/* $NEWMETA/help
43 47 fi
44 48  
45 49 # copy all help files
46   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/help/auto ]; then
47   - mkdir $AMDAINSTALLATION/AMDA_IHM/help/auto
  50 +if [ ! -d "$HelpAuto" ]; then
  51 + mkdir -p $HelpAuto
48 52 fi
49   -cp $NEWMETA/help/* $AMDAINSTALLATION/AMDA_IHM/help/auto
  53 +cp $NEWMETA/help/* $HelpAuto
50 54  
51   -if [ -d $AMDAINTERNALDIR/HELP_PREDEFINED/img ]; then
52   - if [ ! -d $AMDAINSTALLATION/AMDA_IHM/help/auto/img ]; then
53   - mkdir $AMDAINSTALLATION/AMDA_IHM/help/auto/img
  55 +if [ -d "$AMDAINTERNALDIR/HELP_PREDEFINED/img" ]; then
  56 + if [ ! -d "$HelpAuto/img" ]; then
  57 + mkdir $HelpAuto/img
54 58 fi
55   - cp $AMDAINTERNALDIR/HELP_PREDEFINED/img/* $AMDAINSTALLATION/AMDA_IHM/help/auto/img
  59 + cp $AMDAINTERNALDIR/HELP_PREDEFINED/img/* $HelpAuto/img
56 60 fi
57 61  
58 62 # copy info for parameter arguments
59   -if [ -d $NEWMETA/ParamInfo ]; then
60   - if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo ]; then
61   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  63 +if [ -d "$NEWMETA/ParamInfo" ]; then
  64 + if [ ! -d "$PARAMS_LOCALINFO_DIR" ]; then
  65 + mkdir $PARAMS_LOCALINFO_DIR
62 66 fi
63   - cp $NEWMETA/ParamInfo/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  67 + cp $NEWMETA/ParamInfo/info*.xml $PARAMS_LOCALINFO_DIR
64 68 fi
65 69  
66 70 # copy LocalParams.xml created by makeTree.php to AMDA installation
67   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ]; then
68   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData
  71 +if [ ! -d "$LocalData" ]; then
  72 + mkdir $LocalData
69 73 fi
70   -if [ -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ] && [ -e ./LocalParams.xml ]; then
71   - mv ./LocalParams.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData
72   -fi
73 74 \ No newline at end of file
  75 +if [ -d "$LocalData" ] && [ -f "$UPDATEDIR/LocalParams.xml" ]; then
  76 + mv $UPDATEDIR/LocalParams.xml $LocalData
  77 +fi
... ...
update_amda/generate_param_info
  Diff comments   View file @99ae874
1 1 #!/bin/bash
2 2  
3   -if [[ -z ${NEWMETA+x} || -z ${AMDAINSTALLATION+x} ]]; then
4   - echo "check if NEWMETA & AMDAINSTALLATION env variables are defined"
  3 +SCRIPT=$(readlink -f "$0")
  4 +export UPDATEDIR=$(dirname "$SCRIPT")
  5 +. $UPDATEDIR/updateEnv.sh
  6 +
  7 +if [[ -z ${NEWMETA+x} || -z ${AMDA_KERNEL_DIR+x} ]]; then
  8 + echo "[ERROR] check if NEWMETA & AMDA_KERNEL_DIR env variables are defined"
5 9 exit
6 10 fi
7 11  
8 12 CRT_PWD=`pwd`
9 13  
10   -cd $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo
  14 +cd $AMDA_KERNEL_DIR/app-generate-paraminfo
11 15  
12   -export PATH=$AMDAINSTALLATION/AMDA_Kernel/build/${KERNEL_BUILD_TYPE}/bin:$PATH
13   -export DDPATH=$AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo
  16 +export PATH=$AMDA_KERNEL_DIR/build/${KERNEL_BUILD_TYPE}/bin:$PATH
  17 +export DDPATH=$AMDA_KERNEL_DIR/app-generate-paraminfo
14 18  
15 19 PARAM_INFO_PATH=$NEWMETA/ParamInfo
16 20 if [ ! -d "$PARAM_INFO_PATH" ]; then
... ... @@ -73,9 +77,9 @@ else
73 77  
74 78 echo $line >> ./app.properties.temp
75 79  
76   - done < <(cat $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo/app.properties)
  80 + done < <(cat $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties)
77 81  
78   - cp ./app.properties.temp $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo/app.properties
  82 + cp ./app.properties.temp $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties
79 83 fi
80 84  
81 85  
... ... @@ -99,11 +103,11 @@ do
99 103 done
100 104  
101 105 # copy info for parameter arguments
102   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo ]; then
103   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  106 +if [ ! -d $PARAMS_LOCALINFO_DIR ]; then
  107 + mkdir $PARAMS_LOCALINFO_DIR
104 108 fi
105 109  
106   -cp $PARAM_INFO_PATH/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  110 +cp $PARAM_INFO_PATH/info*.xml $PARAMS_LOCALINFO_DIR
107 111  
108 112 cd ${CRT_PWD}
109 113  
... ...
update_amda/makeOrbits
  Diff comments   View file @99ae874
... ... @@ -3,8 +3,13 @@
3 3 #
4 4 #
5 5 #
  6 + SCRIPT=$(readlink -f "$0")
  7 + export UPDATEDIR=$(dirname "$SCRIPT")
  8 + . $UPDATEDIR/updateEnv.sh
  9 +
  10 + if [ ! -d "$AMDA_IHM" ]; then
  11 + echo "[ERROR] check if AMDA_IHM env variable is defined"
  12 + fi
6 13  
7   - if [ -z ${AMDA_IHM+x} ]; then export AMDA_IHM=./..; fi
8   -
9 14 php $AMDA_IHM/php/makeOrbitsList.php
10   - php $AMDA_IHM/php/makeOrbitsInKm.php
11 15 \ No newline at end of file
  16 + php $AMDA_IHM/php/makeOrbitsInKm.php
... ...
update_amda/makeRemote
  Diff comments   View file @99ae874
... ... @@ -3,14 +3,20 @@
3 3 #
4 4 #
5 5 #
6   - if [ -z ${AMDA_IHM+x} ]; then export AMDA_IHM=./..; fi
  6 + SCRIPT=$(readlink -f "$0")
  7 + export UPDATEDIR=$(dirname "$SCRIPT")
  8 + . $UPDATEDIR/updateEnv.sh
  9 +
  10 + if [ ! -d "$AMDA_IHM" ]; then
  11 + echo "[ERROR] check if AMDA_IHM env variable is defined"
  12 + fi
7 13  
8 14 #
9 15 # "AMDA side" ( IMPEX-like ) data centers
10 16 #
11 17  
12 18 # check if Orbites.xml exists; if not create it !
13   - if [ ! -e $AMDA_IHM/generic_data/LocalData/OrbitsAll.xml ]; then
  19 + if [ ! -f "$LocalData/OrbitsAll.xml" ]; then
14 20 php $AMDA_IHM/php/makeOrbitsList.php
15 21 php $AMDA_IHM/php/makeOrbitsInKm.php
16 22 fi
... ... @@ -27,9 +33,9 @@
27 33 # make template args
28 34 php $AMDA_IHM/php/RemoteDataCenter/makeArgs.php
29 35  
30   - if [ ! -e $AMDA_IHM/generic_data/RemoteData/Bases.xml ]; then
31   - mkdir -p $AMDA_IHM/generic_data/RemoteData
32   - cp $AMDA_IHM/php/RemoteDataCenter/Bases.xml $AMDA_IHM/generic_data/RemoteData
  36 + if [ ! -f "$RemoteData/Bases.xml" ]; then
  37 + mkdir -p $RemoteData
  38 + cp $AMDA_IHM/php/RemoteDataCenter/Bases.xml $RemoteData
33 39 fi
34 40  
35 41 #
... ... @@ -38,7 +44,7 @@
38 44 php $AMDA_IHM/php/RemoteDataCenter/getRemoteDDBaseProxies.php
39 45  
40 46 # copy "DDBASE" Remote Params descriptions
41   - if [ -d $AMDA_IHM/generic_data/RemoteData/PARAMS ]; then
42   - cp $AMDA_IHM/generic_data/RemoteData/PARAMS/* $AMDA_IHM/generic_data/newKernelDDBase/
  47 + if [ -d "$RemoteData/PARAMS" ]; then
  48 + cp $AMDA_IHM/generic_data/RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/
43 49 fi
44 50  
... ...
update_amda/makeTree.php
  Diff comments   View file @99ae874
... ... @@ -12,11 +12,7 @@
12 12 else
13 13 require_once(AMDA_SPASE_INTERFACE."/config.php");
14 14  
15   - $AMDAINSTALLATION = getenv("AMDAINSTALLATION");
16   -
17   - define("DATAPATH", "$AMDAINSTALLATION/AMDA_IHM/generic_data/");
18   -
19   - if (file_exists(DATAPATH.'rank.json'))
  15 + if (defined("DATAPATH") && file_exists(DATAPATH.'rank.json'))
20 16 $cmpArr = json_decode(file_get_contents(DATAPATH.'rank.json'), true);
21 17 else
22 18 $cmpArr = null;
... ...
update_amda/mvTemplates.php
  Diff comments   View file @99ae874
1 1 <?php
2 2  
3 3 $NEWMETA = getenv('NEWMETA');
4   - $AMDAINSTALLATION = getenv('AMDAINSTALLATION');
5 4 $AMDAINTERNALDIR = getenv('AMDAINTERNALDIR');
  5 + $PARAMTEMPLATEDIR = getenv('ParamTemplate');
  6 +
  7 + if (empty($NEWMETA)) {
  8 + echo "[ERROR] check if NEWMETA env varibale is defined".PHP_EOL;
  9 + exit(1);
  10 + }
  11 +
  12 + if (empty($AMDAINTERNALDIR)) {
  13 + echo "[ERROR] check if AMDAINTERNALDIR env varibale is defined".PHP_EOL;
  14 + exit(1);
  15 + }
  16 +
  17 + if (empty($PARAMTEMPLATEDIR)) {
  18 + echo "[ERROR] check if PARAMTEMPLATEDIR env varibale is defined".PHP_EOL;
  19 + exit(1);
  20 + }
6 21  
7 22 $templateXml = new DomDocument("1.0");
8 23 $templateXml->load($AMDAINTERNALDIR."/ParamTemplateList.xml");
9 24 $paramTemplates = $templateXml->getElementsByTagName('paramTemplate');
10 25  
11   - if (!is_dir("$AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate"))
12   - mkdir("$AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate");
  26 + if (!is_dir($PARAMTEMPLATEDIR))
  27 + mkdir("$PARAMTEMPLATEDIR");
13 28  
14 29 foreach ($paramTemplates as $template) {
15 30 $paramId = $template->getAttribute('paramId');
... ... @@ -18,7 +33,7 @@
18 33 if (file_exists("$NEWMETA/final/$paramId.xml")) {
19 34 echo "Template ".$paramId.PHP_EOL;
20 35 $from = "$NEWMETA/final/$paramId.xml";
21   - $to = "$AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate/$fileName.xml";
  36 + $to = "$PARAMTEMPLATEDIR/$fileName.xml";
22 37  
23 38 copy($from, $to);
24 39 unlink("$NEWMETA/final/$paramId.xml");
... ... @@ -27,8 +42,8 @@
27 42 if (file_exists("$AMDAINTERNALDIR/INTERNAL_PARAM_DEF/$paramId.xml")) {
28 43 echo "Template ".$paramId.PHP_EOL;
29 44 $from = "$AMDAINTERNALDIR/INTERNAL_PARAM_DEF/$paramId.xml";
30   - $to = "$AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate/$fileName.xml";
  45 + $to = "$PARAMTEMPLATEDIR/$fileName.xml";
31 46 copy($from,$to);
32 47 }
33 48 }
34   -?>
35 49 \ No newline at end of file
  50 +?>
... ...
update_amda/preprocessInfo.php
  Diff comments   View file @99ae874
... ... @@ -4,6 +4,11 @@
4 4 */
5 5 $id = $argv[1];
6 6 $NEWMETA = getenv('NEWMETA');
  7 +
  8 + if ($NEWMETA == "") {
  9 + echo "[ERROR] check if NEWMETA env varibale is defined".PHP_EOL;
  10 + exit(1);
  11 + }
7 12  
8 13 $infoXml = new DomDocument("1.0");
9 14 $infoXml->load($NEWMETA."final/$id.xml");
... ... @@ -37,4 +42,4 @@
37 42 $argsXml->save($NEWMETA."ParamInfo/info_$id.xml");
38 43 }
39 44 }
40   -?>
41 45 \ No newline at end of file
  46 +?>
... ...
update_amda/updateAmda
  Diff comments   View file @99ae874
... ... @@ -97,8 +97,8 @@
97 97 echo "make Orbits : done"
98 98  
99 99 echo "copy DDBASE Remote Params descriptions"
100   - if [ -d $AMDA_IHM/generic_data/RemoteData/PARAMS ]; then
101   - cp $AMDA_IHM/generic_data/RemoteData/PARAMS/* $AMDA_IHM/generic_data/newKernelDDBase/
  100 + if [ -d $RemoteData/PARAMS ]; then
  101 + cp $RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/
102 102 fi
103 103 fi
104 104 # Update StartStop only
... ... @@ -119,14 +119,14 @@
119 119 php $UPDATEDIR/makeTree.php
120 120 echo "make Tree : done"
121 121  
122   - if [ -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ] && [ -e ./LocalParams.xml ]
  122 + if [ -d $LocalData ] && [ -e ./LocalParams.xml ]
123 123 then
124   - mv ./LocalParams.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData
  124 + mv ./LocalParams.xml $LocalData
125 125 fi
126 126 echo 'copy 2 amda : done'
127 127  
128 128 echo "updating OrbitsInfo..."
129   - php $AMDAINSTALLATION/AMDA_IHM/php/RemoteDataCenter/makeOrbitsInfo.php
  129 + php $AMDA_IHM/php/RemoteDataCenter/makeOrbitsInfo.php
130 130 echo "update OrbitsInfo : done"
131 131 fi
132 132  
... ... @@ -140,13 +140,13 @@
140 140  
141 141 generate_param_info
142 142 # copy info for parameter arguments
143   - if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo ]; then
144   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  143 + if [ ! -d $PARAMS_LOCALINFO_DIR ]; then
  144 + mkdir $PARAMS_LOCALINFO_DIR
145 145 fi
146 146  
147 147 if [ -d $NEWMETA/ParamInfo ]
148 148 then
149   - cp $NEWMETA/ParamInfo/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  149 + cp $NEWMETA/ParamInfo/info*.xml $PARAMS_LOCALINFO_DIR
150 150 fi
151 151  
152 152 echo "generate info for arguments : done"
... ...
update_amda/updateEnv.sh
  Diff comments   View file @99ae874
... ... @@ -4,9 +4,28 @@ if [ -z &quot;$UPDATEDIR&quot; ]; then
4 4 echo "[ERROR] UPDATEDIR not defined"
5 5 fi
6 6  
7   -export AMDAINSTALLATION=$UPDATEDIR/../../
  7 +export AMDA_IHM=$(readlink -f "$UPDATEDIR/..")
  8 +
8 9 . $UPDATEDIR/../scripts/loadEnv.sh
9 10  
  11 +if [ -z ${NEWMETA} ]
  12 +then
  13 + echo "[ERROR] check if NEWMETA env variable is defined"
  14 + exit 1
  15 +fi
  16 +
  17 +if [ -z ${AMDA_SPASE_INTERFACE} ]
  18 +then
  19 + echo "[ERROR] check if AMDA_SPASE_INTERFACE env variable is defined"
  20 + exit 1
  21 +fi
  22 +
  23 +if [ -z ${AMDAINTERNALDIR} ]
  24 +then
  25 + echo "[ERROR] check if AMDAINTERNALDIR env variable is defined"
  26 + exit 1
  27 +fi
  28 +
10 29 if [[ ${AMDA_SPASE_INTERFACE: -1} != "/" ]]; then
11 30 export AMDA_SPASE_INTERFACE=$AMDA_SPASE_INTERFACE/
12 31 fi
... ...