Mercurial > dive4elements > river
changeset 6456:0624d3a0a63e
Call official lines macro in system context and fixed the macro.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 26 Jun 2013 22:28:42 +0200 |
| parents | 201d90f56d98 |
| children | 41152c3a532d |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Wed Jun 26 22:23:57 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Wed Jun 26 22:28:42 2013 +0200 @@ -50,6 +50,7 @@ </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> <dc:call-macro name="annotations"/> + <dc:call-macro name="officiallines_user"/> </dc:when> <dc:when test="$out = 'historical_discharge_wq'"> <dc:call-macro name="mainvalues"/> @@ -78,6 +79,7 @@ </dc:when> <dc:when test="$out = 'longitudinal_section'"> <dc:call-macro name="annotations"/> + <dc:call-macro name="officiallines_user"/> </dc:when> <dc:when test="$out = 'fix_longitudinal_section_curve'"> <dc:call-macro name="annotations"/> @@ -2322,19 +2324,15 @@ <dc:container-context container="official-lines"> <dc:properties> <dc:property name="name" alias="olname"/> - <dc:property name="wst" alias="wstid"/> + <dc:property name="wstId" alias="wstid"/> <dc:property name="columnPos" alias="wstcolpos"/> </dc:properties> <dc:if test="dc:has-result()"> <officiallines> <dc:for-each> - <dc:element name="${olname}"> - <dc:attribute name="name" value="${olname}"/> - <dc:attribute name="ids" value="additionals-wstv-${wstcolpos}-${wstid}"/> - <dc:attribute name="factory" value="staticwkms"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="out" value="${out}"/> - </dc:element> + <column name="{$olname}" + ids="additionals-wstv-{$wstcolpos}-{$wstid}" + factory="staticwqkms" target_out="{$out}"/> </dc:for-each> </officiallines> </dc:if>