diff --git a/config/AMDAIntegrationConfig.php b/config/AMDAIntegrationConfig.php index d1a58cf..3581ac5 100644 --- a/config/AMDAIntegrationConfig.php +++ b/config/AMDAIntegrationConfig.php @@ -121,6 +121,25 @@ switch ($localIP) //Path to AMDA_IHM base dir define('IHM_SRC_DIR', '/home/myriam/AMDA_20161215/AMDA_IHM/'); break; + case '192.168.83.101' : + define('PLATFORM_NAME','amdadev platform at AKKA'); + + //AKKA - Force the IP client value to prevent a bug with DDServer + // The IP client must be write with the pattern : xxx.xxx.xxx.xxx + define('FORCE_CLIENT_IP', '192.168.83.101'); + + // true for AKKA + // false or not defined for IRAP + // It's used to select the correct SVN path for depotInfo repository + //define('AKKA_SVN', 'true'); + + //Path to AMDA_Kernel base dir + define('NEWKERNEL_BASE_PATH', '/home/brenard/AMDA-GIT/AMDA_Kernel/'); + + //Path to AMDA_IHM base dir + define('IHM_SRC_DIR', '/var/www/AMDA_IHM/'); + + break; } @@ -140,11 +159,8 @@ define ('NEWKERNEL_INSTALL_DIR', NEWKERNEL_BASE_PATH.'build/Release/'); //Path to AMDA_Kernel config dir define('NEWKERNEL_CONFIG_DIR', NEWKERNEL_BASE_PATH.'app-release/'); -//Path to AMDA_Kernel XSD dir -define('NEWKERNEL_XSD_DIR', NEWKERNEL_BASE_PATH.'config/DataBaseParameters/xsd/'); - -//Path to AMDA_Kernel info dir -define('NEWKERNEL_INFO_DIR', NEWKERNEL_BASE_PATH.'config/'); +//Path to AMDA_Kernel XSD files dir +define('NEWKERNEL_XSD_DIR', NEWKERNEL_BASE_PATH.'config/xsd/'); //Path to local parameters database for the new kernel define('PARAMS_LOCALDB_DIR', IHM_SRC_DIR.'generic_data/newKernelDDBase/'); @@ -152,6 +168,9 @@ define('PARAMS_LOCALDB_DIR', IHM_SRC_DIR.'generic_data/newKernelDDBase/'); //Path to local parameters information files define('PARAMS_LOCALINFO_DIR', IHM_SRC_DIR.'generic_data/ParamInfo/'); +//Root path for directories used for databases, instruments and missions information files +define ('NEWKERNEL_INFO_DIR', IHM_SRC_DIR.'generic_data/'); + //Path to dir that include DD.res file define('DDRES_DIR', NEWKERNEL_BASE_PATH.'app-release/'); diff --git a/src/Request/Config/KernelConfigClass.php b/src/Request/Config/KernelConfigClass.php index b117fd4..5659e0c 100644 --- a/src/Request/Config/KernelConfigClass.php +++ b/src/Request/Config/KernelConfigClass.php @@ -11,7 +11,7 @@ class KernelConfigClass private static $xsdParameterDir = "parameter/"; private static $xsdInfoDir = "info/"; private static $xsdLocalBaseDir = "localbase/"; - private static $xsdSpiceKernelDir = "SpiceKernel/"; + private static $xsdSpiceKernelDir = "spicekernel/"; private static $propFile = "app.properties"; @@ -123,7 +123,7 @@ class KernelConfigClass public static function getXSDSpiceKernelConfigFilePath() { - return NEWKERNEL_INFO_DIR.self::$xsdSpiceKernelDir.'config.xsd'; + return NEWKERNEL_XSD_DIR.self::$xsdSpiceKernelDir.'config.xsd'; } -- libgit2 0.21.2