Commit c6c2f576db1bc28eb654e024c73497ad18041b11
1 parent
3a1fa4bd
Exists in
master
and in
110 other branches
Update Remote Bases
Showing
4 changed files
with
15 additions
and
46 deletions
Show diff stats
generic_data/RemoteData/Bases.xml deleted
... | ... | @@ -1,16 +0,0 @@ |
1 | -<?xml version="1.0"?> | |
2 | -<dataRoot xml:id="myRemoteData-treeRootNode"> | |
3 | - <!--<dataCenter name="CDAWeb@NASA" desc="Coordinated_Data_Analysis" group="" id1="CDAWEB" xml:id="CDAWEB"/> | |
4 | - <dataCenter name="MAPSKP@IRAP" desc="Cassini MAPS_Key_Parameters" group="" default="yes" id1="MAPSKP" xml:id="MAPSKP"/> | |
5 | - <dataCenter name="THEMIS@IRAP" desc="Mirror_CESR_Data_Base" group="" default="yes" id1="THEMIS" xml:id="THEMIS"/> | |
6 | - <dataCenter name="CLWEB@IRAP" desc="CLWeb_Internal_Data_Base" default="yes" id1="CLWeb" xml:id="CLWeb"/>--> | |
7 | - <dataCenter name="LATMOS" desc="Latmos Hybrid Simulation Database" isSimulation='1' default="yes" id1="LATMOS" xml:id="LATMOS"/> | |
8 | - <dataCenter name="FMI_HYBRID" desc="FMI Hybrid Simulation Database" isSimulation='1' default="yes" id1="FMI_HYBRID" xml:id="FMI_HYBRID"/> | |
9 | - <dataCenter name="FMI_GUMICS" desc="FMI MHD simulation database" isSimulation='1' default="yes" id1="FMI_GUMICS" xml:id="FMI_GUMICS"/> | |
10 | - <!--<dataCenter name="SINP" desc="Paraboloid model calculates the magnetic fields in the Earth's magnetosphere depending on external conditions in solar wind and on geomagnetic activity level" isSimulation='1' default="yes" id1="SINP" xml:id="SINP"/>--> | |
11 | - <dataCenter name="LESIA" desc="LESIA MASER" default="yes" id1="LESIA" isSimulation='1' xml:id="LESIA"/> | |
12 | - <!--<dataCenter name="CDPP" desc="CCMC BATSRUS with RCM v8.01" default="yes" id1="CCMC" isSimulation='1' xml:id="CCMC"/>--> | |
13 | - <dataCenter name="IPIM" desc="IPIM @ IRAP" default="yes" id1="IPIM" isSimulation='1' xml:id="IPIM"/> | |
14 | -</dataRoot> | |
15 | - | |
16 | - |
php/RemoteDataCenter/getRemoteDDBaseProxies.php
... | ... | @@ -45,19 +45,27 @@ |
45 | 45 | exit("No Bases.xml file at DDBase/INFO ? IMPEX only".PHP_EOL); |
46 | 46 | |
47 | 47 | $basesRemote = $basesDomRemote->getElementsByTagName("dataCenter"); |
48 | - | |
48 | + echo INFOSITE.PHP_EOL; | |
49 | 49 | foreach ($basesRemote as $baseRemote) { |
50 | 50 | $baseId = $baseRemote->getAttribute("xml:id"); |
51 | + | |
51 | 52 | // add remote base if it doesn't exist |
52 | 53 | if (!$basesDom->getElementById($baseId)) { |
53 | - $baseClone = $basesDom->importNode($baseRemote); | |
54 | - $basesDom->documentElement->appendChild($baseClone); | |
55 | 54 | $baseDir = DATAPATH."/RemoteData/$baseId"; |
56 | 55 | $baseDirRemote = INFOSITE."INFO/bases/$baseId"; |
57 | 56 | if (!is_dir($baseDir)) mkdir($baseDir); |
58 | - | |
59 | - if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) | |
60 | - echo "Cannot copy base.xml for $baseId".PHP_EOL; | |
57 | + if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) { | |
58 | + echo "Cannot copy base.xml for $baseId".PHP_EOL; | |
59 | + } | |
60 | + else { | |
61 | + $baseClone = $basesDom->importNode($baseRemote); | |
62 | + $basesDom->documentElement->appendChild($baseClone); | |
63 | + echo "Added $baseId".PHP_EOL; | |
64 | + if ($baseId == "THEMIS") { | |
65 | + $center = new THEMIS(); | |
66 | + $center->makeAllParams(); | |
67 | + } | |
68 | + } | |
61 | 69 | } |
62 | 70 | } |
63 | 71 | } | ... | ... |
php/RemoteDataCenter/makeRemoteParamInternal.php deleted
... | ... | @@ -1,20 +0,0 @@ |
1 | -<?php | |
2 | -/* | |
3 | -* Executable to make | |
4 | -*/ | |
5 | - | |
6 | - if (!function_exists('__autoload')) { | |
7 | - function __autoload($class_name) { | |
8 | - require_once $class_name . '.php'; | |
9 | - } | |
10 | - } | |
11 | - | |
12 | - $AMDA_IHM = getenv('AMDA_IHM'); | |
13 | - | |
14 | - require_once $AMDA_IHM."/php/config.php"; | |
15 | - | |
16 | - $center = new THEMIS(); | |
17 | - | |
18 | - $center->makeAllParams(); | |
19 | - | |
20 | -?> | |
21 | 0 | \ No newline at end of file |
update_amda/makeRemote
... | ... | @@ -35,10 +35,7 @@ |
35 | 35 | # "DDBASE side" ( CDAWEB-like ) data centers |
36 | 36 | # |
37 | 37 | php $AMDA_IHM/php/RemoteDataCenter/getRemoteDDBaseProxies.php |
38 | - | |
39 | - # make THEMIS Remote Params descriptions | |
40 | - php $AMDA_IHM/php/RemoteDataCenter/makeRemoteParamInternal.php | |
41 | - | |
38 | + | |
42 | 39 | # copy "DDBASE" Remote Params descriptions |
43 | 40 | if [ -d $AMDA_IHM/generic_data/RemoteData/PARAMS ]; then |
44 | 41 | cp $AMDA_IHM/generic_data/RemoteData/PARAMS/* $AMDA_IHM/generic_data/newKernelDDBase/ | ... | ... |