diff --git a/php/RemoteDataCenter/RemoteParamManager.php b/php/RemoteDataCenter/RemoteParamManager.php index 1e0cdc3..3ee109e 100644 --- a/php/RemoteDataCenter/RemoteParamManager.php +++ b/php/RemoteDataCenter/RemoteParamManager.php @@ -188,7 +188,7 @@ class RemoteParamManager if (!$status) return false; - $remoteDatasetInfo = INFOSITE."/INFO/bases/".$this->center->baseID."/".$this->center->infoFile; + $remoteDatasetInfo = DDSERVICE."/BASE/INFO/bases/".$this->center->baseID."/".$this->center->infoFile; $localDatasetInfo = RemoteData.$this->center->baseID."/".$this->center->infoFile; if (!copy($remoteDatasetInfo,$localDatasetInfo)) return false; @@ -335,4 +335,4 @@ class RemoteParamManager } } -?> \ No newline at end of file +?> diff --git a/php/RemoteDataCenter/getRemoteDDBaseProxies.php b/php/RemoteDataCenter/getRemoteDDBaseProxies.php index a44fead..adcfb9f 100644 --- a/php/RemoteDataCenter/getRemoteDDBaseProxies.php +++ b/php/RemoteDataCenter/getRemoteDDBaseProxies.php @@ -16,10 +16,11 @@ // only "DDBASE" Bases.xml if (!file_exists(DATAPATH."/RemoteData/Bases.xml")) { + if (!is_dir(DATAPATH."/RemoteData")) mkdir(DATAPATH."/RemoteData"); echo 'No Bases.xml file : Will use Bases.xml from DDBase'.PHP_EOL; $basesDom = new DomDocument("1.0"); - if (!@$basesDom->load(INFOSITE."INFO/Bases.xml")) + if (!@$basesDom->load(DDSERVICE."/BASE/INFO/Bases.xml")) exit("No Bases.xml file at DDBase/INFO ? no Remote bases at all".PHP_EOL); $bases = $basesDom->getElementsByTagName("dataCenter"); @@ -27,10 +28,8 @@ $baseId = $base->getAttribute("xml:id"); $baseDir = DATAPATH."/RemoteData/$baseId"; - $baseDirRemote = INFOSITE."INFO/bases/$baseId"; - + $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId"; if (!is_dir($baseDir)) mkdir($baseDir); - if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) echo "Cannot copy base.xml for $baseId".PHP_EOL; } @@ -41,18 +40,17 @@ $basesDom->load(DATAPATH."/RemoteData/Bases.xml"); $basesDomRemote = new DomDocument("1.0"); - if (!@$basesDomRemote->load(INFOSITE."INFO/Bases.xml")) + if (!@$basesDomRemote->load(DDSERVICE."/BASE/INFO/Bases.xml")) exit("No Bases.xml file at DDBase/INFO ? IMPEX only".PHP_EOL); $basesRemote = $basesDomRemote->getElementsByTagName("dataCenter"); - echo INFOSITE.PHP_EOL; foreach ($basesRemote as $baseRemote) { $baseId = $baseRemote->getAttribute("xml:id"); // add remote base if it doesn't exist if (!$basesDom->getElementById($baseId)) { $baseDir = DATAPATH."/RemoteData/$baseId"; - $baseDirRemote = INFOSITE."INFO/bases/$baseId"; + $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId"; if (!is_dir($baseDir)) mkdir($baseDir); if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) { echo "Cannot copy base.xml for $baseId".PHP_EOL; @@ -72,4 +70,4 @@ $basesDom->save(DATAPATH."/RemoteData/Bases.xml"); -?> \ No newline at end of file +?> diff --git a/php/config.php b/php/config.php index 08f9ef9..c5b97be 100644 --- a/php/config.php +++ b/php/config.php @@ -107,6 +107,8 @@ $SERVER_NAME = $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : gethostname( define('webAlias',"http://".$SERVER_NAME.APACHE_ALIAS); define('wsdl_AMDA', webAlias."public/wsdl/Methods_AMDA.wsdl"); +define('DD_WSDL',DDSERVICE.'/dd.wsdl'); + // AKKA - KERNELBIN is now the new kernel bin dir define('KERNELBIN',NEWKERNEL_INSTALL_DIR.'bin/'); diff --git a/php/my_config.php b/php/my_config.php index 59a85a6..9c1c6af 100644 --- a/php/my_config.php +++ b/php/my_config.php @@ -9,7 +9,7 @@ define('INTEGRATION_BASE_PATH', '/home/brenard/AMDA-GIT/AMDA_Integration/'); //DD WebServices -define('INFOSITE', 'http://amdadev.fr/DDService/BASE/'); +define('DDSERVICE', 'http://amdadev.fr/DDService/'); // User apache define('APACHE_USER', 'apache'); // Alias for name of AMDA @@ -17,8 +17,6 @@ define('APACHE_ALIAS', ''); //email to send errors from AmdaUpdate/AmdaInstall define('email','ebudnik@irap.omp.eu'); -// for updateAmda -define('DD_WSDL','http://amdadev.fr/DDService/dd.wsdl'); define('TITLE', 'AMDANEW-Test'); // real upload_max_filesize is defined in /etc/php.ini : ini_get('upload_max_filesize') -- libgit2 0.21.2