CDPP / AMDA_Integration

Commit dc77849c2db39804d6bcc8c156404840bb1a3d80

Authored by Benjamin Renard
1 parent bc8ee588
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Fix XSD path definition in the config file + informations files about datasets, … 

…instruments and missions are now located in AMDA_IHM/generic_data
Showing 2 changed files with 26 additions and 7 deletions   Show diff stats
Inline Side-by-side
config/AMDAIntegrationConfig.php
  Diff comments   View file @dc77849
@@ -121,6 +121,25 @@ switch ($localIP) @@ -121,6 +121,25 @@ switch ($localIP)
121 //Path to AMDA_IHM base dir 121 //Path to AMDA_IHM base dir
122 define('IHM_SRC_DIR', '/home/myriam/AMDA_20161215/AMDA_IHM/'); 122 define('IHM_SRC_DIR', '/home/myriam/AMDA_20161215/AMDA_IHM/');
123 break; 123 break;
  124 + case '192.168.83.101' :
  125 + define('PLATFORM_NAME','amdadev platform at AKKA');
  126 +
  127 + //AKKA - Force the IP client value to prevent a bug with DDServer
  128 + // The IP client must be write with the pattern : xxx.xxx.xxx.xxx
  129 + define('FORCE_CLIENT_IP', '192.168.83.101');
  130 +
  131 + // true for AKKA
  132 + // false or not defined for IRAP
  133 + // It's used to select the correct SVN path for depotInfo repository
  134 + //define('AKKA_SVN', 'true');
  135 +
  136 + //Path to AMDA_Kernel base dir
  137 + define('NEWKERNEL_BASE_PATH', '/home/brenard/AMDA-GIT/AMDA_Kernel/');
  138 +
  139 + //Path to AMDA_IHM base dir
  140 + define('IHM_SRC_DIR', '/var/www/AMDA_IHM/');
  141 +
  142 + break;
124 } 143 }
125 144
126 145
@@ -140,11 +159,8 @@ define ('NEWKERNEL_INSTALL_DIR', NEWKERNEL_BASE_PATH.'build/Release/'); @@ -140,11 +159,8 @@ define ('NEWKERNEL_INSTALL_DIR', NEWKERNEL_BASE_PATH.'build/Release/');
140 //Path to AMDA_Kernel config dir 159 //Path to AMDA_Kernel config dir
141 define('NEWKERNEL_CONFIG_DIR', NEWKERNEL_BASE_PATH.'app-release/'); 160 define('NEWKERNEL_CONFIG_DIR', NEWKERNEL_BASE_PATH.'app-release/');
142 161
143 -//Path to AMDA_Kernel XSD dir  
144 -define('NEWKERNEL_XSD_DIR', NEWKERNEL_BASE_PATH.'config/DataBaseParameters/xsd/');  
145 -  
146 -//Path to AMDA_Kernel info dir  
147 -define('NEWKERNEL_INFO_DIR', NEWKERNEL_BASE_PATH.'config/'); 162 +//Path to AMDA_Kernel XSD files dir
  163 +define('NEWKERNEL_XSD_DIR', NEWKERNEL_BASE_PATH.'config/xsd/');
148 164
149 //Path to local parameters database for the new kernel 165 //Path to local parameters database for the new kernel
150 define('PARAMS_LOCALDB_DIR', IHM_SRC_DIR.'generic_data/newKernelDDBase/'); 166 define('PARAMS_LOCALDB_DIR', IHM_SRC_DIR.'generic_data/newKernelDDBase/');
@@ -152,6 +168,9 @@ define('PARAMS_LOCALDB_DIR', IHM_SRC_DIR.'generic_data/newKernelDDBase/'); @@ -152,6 +168,9 @@ define('PARAMS_LOCALDB_DIR', IHM_SRC_DIR.'generic_data/newKernelDDBase/');
152 //Path to local parameters information files 168 //Path to local parameters information files
153 define('PARAMS_LOCALINFO_DIR', IHM_SRC_DIR.'generic_data/ParamInfo/'); 169 define('PARAMS_LOCALINFO_DIR', IHM_SRC_DIR.'generic_data/ParamInfo/');
154 170
  171 +//Root path for directories used for databases, instruments and missions information files
  172 +define ('NEWKERNEL_INFO_DIR', IHM_SRC_DIR.'generic_data/');
  173 +
155 //Path to dir that include DD.res file 174 //Path to dir that include DD.res file
156 define('DDRES_DIR', NEWKERNEL_BASE_PATH.'app-release/'); 175 define('DDRES_DIR', NEWKERNEL_BASE_PATH.'app-release/');
157 176
src/Request/Config/KernelConfigClass.php
  Diff comments   View file @dc77849
@@ -11,7 +11,7 @@ class KernelConfigClass @@ -11,7 +11,7 @@ class KernelConfigClass
11 private static $xsdParameterDir = "parameter/"; 11 private static $xsdParameterDir = "parameter/";
12 private static $xsdInfoDir = "info/"; 12 private static $xsdInfoDir = "info/";
13 private static $xsdLocalBaseDir = "localbase/"; 13 private static $xsdLocalBaseDir = "localbase/";
14 - private static $xsdSpiceKernelDir = "SpiceKernel/"; 14 + private static $xsdSpiceKernelDir = "spicekernel/";
15 15
16 private static $propFile = "app.properties"; 16 private static $propFile = "app.properties";
17 17
@@ -123,7 +123,7 @@ class KernelConfigClass @@ -123,7 +123,7 @@ class KernelConfigClass
123 123
124 public static function getXSDSpiceKernelConfigFilePath() 124 public static function getXSDSpiceKernelConfigFilePath()
125 { 125 {
126 - return NEWKERNEL_INFO_DIR.self::$xsdSpiceKernelDir.'config.xsd'; 126 + return NEWKERNEL_XSD_DIR.self::$xsdSpiceKernelDir.'config.xsd';
127 } 127 }
128 128
129 129