CDPP / AMDA_Integration

Commit 8cf39be4df9ab6515736994ba832320a395cb66c

Authored by Benjamin Renard
1 parent e42edd50
Exists in master and in 51 other branches 10098, 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, amdadev, anr_tempete, cu2022, density_maps, develop, frames-transformation, master_vge, mlplasmas, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Add functions args list file

Showing 5 changed files with 26 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Config/IHMConfigClass.php
  Diff comments   View file @8cf39be
... ... @@ -14,6 +14,8 @@ class IHMConfigClass
14 14 private static $constantsFile = "constants.xml";
15 15  
16 16 private static $functionsFile = "functions.xml";
  17 +
  18 + private static $functionsArgsListFile = "functions_args_list.xml";
17 19  
18 20 private static $paramTemplateDir = "LocalData/ParamTemplate/";
19 21  
... ... @@ -145,6 +147,11 @@ class IHMConfigClass
145 147 {
146 148 return self::getGenericDataPath().self::$functionsDir.self::$functionsFile;
147 149 }
  150 +
  151 + public static function getFunctionsArgsListFilePath()
  152 + {
  153 + return self::getGenericDataPath().self::$functionsDir.self::$functionsArgsListFile;
  154 + }
148 155  
149 156 public static function getParamTemplateFilePath($fileName)
150 157 {
... ...
src/InputOutput/IHMImpl/Tools/IHMParamManagerClass.php
  Diff comments   View file @8cf39be
... ... @@ -707,6 +707,7 @@ class IHMParamManagerClass
707 707 $parserData->setConstantsFilePath(IHMConfigClass::getConstantsFilePath());
708 708 $parserData->setFunctionsFilePath(IHMConfigClass::getFunctionsFilePath());
709 709 $parserData->setParamTemplatesFilePath(IHMConfigClass::getParamTemplateListFilePath());
  710 + $parserData->setFunctionsArgsListFilePath(IHMConfigClass::getFunctionsArgsListFilePath());
710 711 $parserData->setOutputFileName($outputFileName);
711 712 $resultFilePath = $workingDir."/".$outputFileName;
712 713  
... ...
src/Request/Config/KernelConfigClass.php
  Diff comments   View file @8cf39be
... ... @@ -120,6 +120,11 @@ class KernelConfigClass
120 120 return AMDA_KERNEL_DIR.'/config/xsd/parser/functions.xsd';
121 121 }
122 122  
  123 + public static function getXSDFunctionsArgsListFilePath()
  124 + {
  125 + return AMDA_KERNEL_DIR.'/config/xsd/parser/functionsArgsList.xsd';
  126 + }
  127 +
123 128 public static function getXSDConstantsFilePath()
124 129 {
125 130 return AMDA_KERNEL_DIR.'/config/xsd/parser/constants.xsd';
... ... @@ -186,7 +191,7 @@ class KernelConfigClass
186 191 return self::$nbMaxProcessGlobal;
187 192 }
188 193  
189   - public static function write($working_dir, $compilation_path = "", $localbase_path = "", $functionsfile_path = "", $constantsfile_path = "", $paramtemplatesfile_path = "")
  194 + public static function write($working_dir, $compilation_path = "", $localbase_path = "", $functionsfile_path = "", $constantsfile_path = "", $paramtemplatesfile_path = "", $functionsargslistfile_path = "")
190 195 {
191 196 //create app.properties file
192 197 $appProperties = array();
... ... @@ -216,6 +221,8 @@ class KernelConfigClass
216 221 $appProperties["app.ihmFunctions.xml"] = $functionsfile_path;
217 222 $appProperties["app.ihmTemplateParams.xsd"] = self::getXSDParamTemplatesFilePath();
218 223 $appProperties["app.ihmTemplateParams.xml"] = $paramtemplatesfile_path;
  224 + $appProperties["app.ihmFunctionsArgsList.xsd"] = self::getXSDFunctionsArgsListFilePath();
  225 + $appProperties["app.ihmFunctionsArgsList.xml"] = $functionsargslistfile_path;
219 226  
220 227 $appProperties["app.plugin"] = AMDA_KERNEL_BUILD_DIR.'/'.self::$pluginDir;
221 228 $appProperties["app.process.src"] = $compilation_path.self::$userSrcDir;
... ...
src/Request/ParserRequestImpl/ParserRequestClass.php
  Diff comments   View file @8cf39be
... ... @@ -35,7 +35,7 @@ class ParserRequestClass extends ProcessRequestClass
35 35  
36 36 //create config files
37 37 KernelConfigClass::setForceParamsDir($this->requestData->getLocalParamsPath());
38   - KernelConfigClass::write($this->requestData->getWorkingPath(), "", "", $this->requestData->getFunctionsFilePath(), $this->requestData->getConstantsFilePath(), $this->requestData->getParamTemplatesFilePath());
  38 + KernelConfigClass::write($this->requestData->getWorkingPath(), "", "", $this->requestData->getFunctionsFilePath(), $this->requestData->getConstantsFilePath(), $this->requestData->getParamTemplatesFilePath(), $this->requestData->getFunctionsArgsListFilePath());
39 39 KernelConfigClass::setForceParamsDir("");
40 40  
41 41 return true;
... ...
src/Request/ParserRequestImpl/ParserRequestDataClass.php
  Diff comments   View file @8cf39be
... ... @@ -13,6 +13,7 @@ class ParserRequestDataClass extends ProcessRequestDataClass
13 13 private $functionsFilePath = "";
14 14 private $paramTemplatesFilePath = "";
15 15 private $localParamsPath = "";
  16 + private $functionsArgsListFilePath = "";
16 17  
17 18 function __construct()
18 19 {
... ... @@ -70,6 +71,14 @@ class ParserRequestDataClass extends ProcessRequestDataClass
70 71 public function getParamTemplatesFilePath() {
71 72 return $this->paramTemplatesFilePath;
72 73 }
  74 +
  75 + public function setFunctionsArgsListFilePath($functionsArgsListFilePath) {
  76 + $this->functionsArgsListFilePath = $functionsArgsListFilePath;
  77 + }
  78 +
  79 + public function getFunctionsArgsListFilePath() {
  80 + return $this->functionsArgsListFilePath;
  81 + }
73 82 }
74 83  
75 84 ?>
... ...