CDPP / AMDA_Integration

Commit c582ff6c87e5df70bfb0bf3166539a96c37dc78c

Authored by Benjamin Renard
1 parent c0535e83
Exists in master and in 65 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, 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 test used to know if the getElementsByTagName function returns at least one node

Showing 2 changed files with 21 additions and 16 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMUserParamLoaderClass.php
  Diff comments   View file @c582ff6
... ... @@ -183,7 +183,7 @@ class IHMUserParamLoaderClass
183 183 $derivedNodes = $dom->getElementsByTagName(self::$mgrDerivedNode);
184 184  
185 185 $derivedParams = array();
186   - if (count($derivedNodes) > 0)
  186 + if ($derivedNodes->length > 0)
187 187 {
188 188 $derivedParamNodes = $derivedNodes->item(0)->getElementsByTagName(self::$mgrDerivedParamNode);
189 189 foreach ($derivedParamNodes as $derivedParamNode)
... ... @@ -220,7 +220,7 @@ class IHMUserParamLoaderClass
220 220 $uploadedNodes = $dom->getElementsByTagName(self::$mgrUploadedNode);
221 221  
222 222 $uploadedParams = array();
223   - if (count($uploadedNodes) > 0)
  223 + if ($uploadedNodes->length > 0)
224 224 {
225 225 $uploadedParamNodes = $uploadedNodes->item(0)->getElementsByTagName(self::$mgrUploadedParamNode);
226 226 foreach ($uploadedParamNodes as $uploadedParamNode)
... ... @@ -272,7 +272,7 @@ class IHMUserParamLoaderClass
272 272  
273 273 //get parameter units
274 274 $unitsNodes = $dom->getElementsByTagName(self::$infoDerivedUnitsNode);
275   - if (count($unitsNodes) > 0) {
  275 + if ($unitsNodes->length > 0) {
276 276 $result["units"] = $unitsNodes->item(0)->nodeValue;
277 277 if ($result["units"] == self::$infoDerivedUndefined) {
278 278 $result["units"] = "";
... ... @@ -281,7 +281,7 @@ class IHMUserParamLoaderClass
281 281  
282 282 //get parameter y title
283 283 $yTitleNodes = $dom->getElementsByTagName(self::$infoDerivedYTitleNode);
284   - if (count($yTitleNodes) > 0) {
  284 + if ($yTitleNodes->length > 0) {
285 285 $result["yTitle"] = $yTitleNodes->item(0)->nodeValue;
286 286 if ($result["yTitle"] == self::$infoDerivedUndefined) {
287 287 $result["yTitle"] = "";
... ... @@ -290,7 +290,7 @@ class IHMUserParamLoaderClass
290 290  
291 291 //get parameter description
292 292 $descNodes = $dom->getElementsByTagName(self::$infoDerivedDescriptionNode);
293   - if (count($descNodes) > 0)
  293 + if ($descNodes->length > 0)
294 294 $result["description"] = $descNodes->item(0)->nodeValue;
295 295  
296 296 return $result;
... ... @@ -316,52 +316,54 @@ class IHMUserParamLoaderClass
316 316  
317 317 //get parameter min sampling
318 318 $minSamplingNodes = $dom->getElementsByTagName(self::$infoUploadedMinSamplingNode);
319   - if (count($minSamplingNodes) > 0)
  319 + if ($minSamplingNodes->length > 0)
320 320 $result["minSampling"] = $minSamplingNodes->item(0)->nodeValue;
321 321  
322 322 //get parameter max sampling
323 323 $maxSamplingNodes = $dom->getElementsByTagName(self::$infoUploadedMaxSamplingNode);
324   - if (count($maxSamplingNodes) > 0)
  324 + if ($maxSamplingNodes->length > 0)
325 325 $result["maxSampling"] = $maxSamplingNodes->item(0)->nodeValue;
  326 + else
  327 + $result["maxSampling"] = $result["minSampling"];
326 328  
327 329 //get parameter real var
328 330 $realVarNodes = $dom->getElementsByTagName(self::$infoUploadedRealVarNode);
329   - if (count($realVarNodes) > 0)
  331 + if ($realVarNodes->length > 0)
330 332 $result["realVar"] = $realVarNodes->item(0)->nodeValue;
331 333  
332 334 //get parameter type
333 335 $typeNodes = $dom->getElementsByTagName(self::$infoUploadedTypeNode);
334   - if (count($typeNodes) > 0)
  336 + if ($typeNodes->length > 0)
335 337 $result["type"] = $typeNodes->item(0)->nodeValue;
336 338  
337 339 //get parameter size
338 340 $sizeNodes = $dom->getElementsByTagName(self::$infoUploadedSizeNode);
339   - if (count($sizeNodes) > 0)
  341 + if ($sizeNodes->length > 0)
340 342 $result["size"] = $sizeNodes->item(0)->nodeValue;
341 343  
342 344 //get parameter VirtualInstrument ID
343 345 $viIdNodes = $dom->getElementsByTagName(self::$infoUploadedVIIdNode);
344   - if (count($viIdNodes) > 0)
  346 + if ($viIdNodes->length > 0)
345 347 $result["viId"] = $viIdNodes->item(0)->nodeValue;
346 348  
347 349 //get parameter plot type
348 350 $plotTypeNodes = $dom->getElementsByTagName(self::$infoUploadedPlotTypeNode);
349   - if (count($plotTypeNodes) > 0)
  351 + if ($plotTypeNodes->length > 0)
350 352 $result["plotType"] = $plotTypeNodes->item(0)->nodeValue;
351 353  
352 354 //get parameter y units
353 355 $unitsNodes = $dom->getElementsByTagName(self::$infoUploadedUnitsNode);
354   - if (count($unitsNodes) > 0)
  356 + if ($unitsNodes->length > 0)
355 357 $result["units"] = $unitsNodes->item(0)->nodeValue;
356 358  
357 359 //get parameter y title
358 360 $yTitleNodes = $dom->getElementsByTagName(self::$infoUploadedYTitleNode);
359   - if (count($yTitleNodes) > 0)
  361 + if ($yTitleNodes->length > 0)
360 362 $result["yTitle"] = $yTitleNodes->item(0)->nodeValue;
361 363  
362 364 //get table definition
363 365 $tableDefNodes = $dom->getElementsByTagName(self::$infoUploadedTableDefNode);
364   - if (count($tableDefNodes) > 0)
  366 + if ($tableDefNodes->length > 0)
365 367 {
366 368 $tableDefNode = $tableDefNodes->item(0);
367 369 $tableDefType = $tableDefNode->getAttribute('tableDefType');
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPageNodeClass.php
  Diff comments   View file @c582ff6
... ... @@ -2,6 +2,9 @@
2 2  
3 3 require_once("RequestOutputPlotPanelNodeClass.php");
4 4 require_once("RequestOutputPlotLayoutNodeClass.php");
  5 +require_once("RequestOutputPlotMarginsNodeClass.php");
  6 +require_once("RequestOutputPlotTitleNodeClass.php");
  7 +require_once("RequestOutputPlotFontNodeClass.php");
5 8  
6 9 define ("REQUESTOUTPUTPLOTPAGE_NAME", "page");
7 10 define ("REQUESTOUTPUTPLOTPAGE_TITLE", "title");
... ... @@ -259,4 +262,4 @@ class RequestOutputPlotPageNodeClass extends NodeClass
259 262 }
260 263 }
261 264  
262   -?>
263 265 \ No newline at end of file
  266 +?>
... ...