Merged
Merge Request #4
·
created by 
Alias
From
alias
into
master
Showing
1 changed file
Show diff stats
src/InputOutput/IHMImpl/Tools/IHMExpressionParserClass.php
| @@ -145,8 +145,8 @@ class IHMExpressionParserClass | @@ -145,8 +145,8 @@ class IHMExpressionParserClass | ||
| 145 | //echo "Source expression : ".$expression.PHP_EOL; | 145 | //echo "Source expression : ".$expression.PHP_EOL; |
| 146 | //clean expression and replace constants and aliases by associated value | 146 | //clean expression and replace constants and aliases by associated value |
| 147 | $this->clean($expression); | 147 | $this->clean($expression); |
| 148 | - $this->replaceConstants($expression); | ||
| 149 | - $this->replaceAliases($expression); | 148 | + $this->replaceConstants($expression); |
| 149 | + $this->replaceAliases($expression); | ||
| 150 | $this->clean($expression); | 150 | $this->clean($expression); |
| 151 | 151 | ||
| 152 | //explode expression | 152 | //explode expression |
| @@ -276,13 +276,12 @@ class IHMExpressionParserClass | @@ -276,13 +276,12 @@ class IHMExpressionParserClass | ||
| 276 | $this->aliasesArray = array(); | 276 | $this->aliasesArray = array(); |
| 277 | 277 | ||
| 278 | $aliases_ = $dom->getElementsByTagName(self::$aliasNode); | 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 | //replace | 283 | //replace |
| 284 | $expression = strtr($expression, $this->aliasesArray); | 284 | $expression = strtr($expression, $this->aliasesArray); |
| 285 | - | ||
| 286 | //be sure that all aliases are replaced | 285 | //be sure that all aliases are replaced |
| 287 | if ($this->isAliasDetected($expression)) | 286 | if ($this->isAliasDetected($expression)) |
| 288 | throw new Exception('Cannot replace some aliases : '.$expression); | 287 | throw new Exception('Cannot replace some aliases : '.$expression); |