Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java @ 4916:2cec81e697e8 dc-km-filter
[branch dc-km-filter] Builder: Let dc:variables always be global.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 30 Jan 2013 15:52:50 +0100 |
| parents | 9c388de4b4d5 |
| children |
comparison
equal
deleted
inserted
replaced
| 4915:bbedd9af069e | 4916:2cec81e697e8 |
|---|---|
| 532 | 532 |
| 533 if (varName.length() == 0 || expr.length() == 0) { | 533 if (varName.length() == 0 || expr.length() == 0) { |
| 534 log.error("dc:variable 'name' or 'expr' empty."); | 534 log.error("dc:variable 'name' or 'expr' empty."); |
| 535 } | 535 } |
| 536 else { | 536 else { |
| 537 frames.put( | 537 Object o = evaluateXPath(expr, typeToQName(type)); |
| 538 frames.putGlobal( | |
| 538 varName.toUpperCase(), | 539 varName.toUpperCase(), |
| 539 evaluateXPath(expr, typeToQName(type))); | 540 o |
| 541 ); | |
| 540 } | 542 } |
| 541 } | 543 } |
| 542 | 544 |
| 543 protected String expand(String s) { | 545 protected String expand(String s) { |
| 544 Matcher m = CompiledStatement.VAR.matcher(s); | 546 Matcher m = CompiledStatement.VAR.matcher(s); |