CDPP / AMDA_Integration

Commit 5c9a58ffcdae40e48d3626a00952b72ed3a25cb4

Authored by Elena Budnik
2 parents 946ea36f 9f267e35
Exists in master and in 56 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, amdadev, anr_tempete, cu2022, density_maps, develop, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Merge branch 'alias' into 'master' 

Alias

See merge request !4
Showing 1 changed file with 4 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Tools/IHMExpressionParserClass.php
  Diff comments   View file @5c9a58f
... ... @@ -145,8 +145,8 @@ class IHMExpressionParserClass
145 145 //echo "Source expression : ".$expression.PHP_EOL;
146 146 //clean expression and replace constants and aliases by associated value
147 147 $this->clean($expression);
148   - $this->replaceConstants($expression);
149   - $this->replaceAliases($expression);
  148 + $this->replaceConstants($expression);
  149 + $this->replaceAliases($expression);
150 150 $this->clean($expression);
151 151  
152 152 //explode expression
... ... @@ -276,13 +276,12 @@ class IHMExpressionParserClass
276 276 $this->aliasesArray = array();
277 277  
278 278 $aliases_ = $dom->getElementsByTagName(self::$aliasNode);
279   - for ($i = 1; $i < $aliases_->length; $i++)
280   - $this->aliasesArray[self::$alias_tag.$aliases_->item($i)->getAttribute(self::$aliasNameAtt)] = $aliases_->item($i)->nodeValue;
  279 + for ($i = 0; $i < $aliases_->length; $i++)
  280 + $this->aliasesArray[self::$aliasTag.$aliases_->item($i)->getAttribute(self::$aliasNameAtt)] = $aliases_->item($i)->getAttribute('xml:id');
281 281 }
282 282  
283 283 //replace
284 284 $expression = strtr($expression, $this->aliasesArray);
285   -
286 285 //be sure that all aliases are replaced
287 286 if ($this->isAliasDetected($expression))
288 287 throw new Exception('Cannot replace some aliases : '.$expression);
... ...