Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 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 | b02f3a948858 |
children | d1d503584d34 |
comparison
equal
deleted
inserted
replaced
6455:201d90f56d98 | 6456:0624d3a0a63e |
---|---|
48 <dc:when test="$out = 'w_differences'"> | 48 <dc:when test="$out = 'w_differences'"> |
49 <dc:call-macro name="annotations"/> | 49 <dc:call-macro name="annotations"/> |
50 </dc:when> | 50 </dc:when> |
51 <dc:when test="$out = 'discharge_longitudinal_section'"> | 51 <dc:when test="$out = 'discharge_longitudinal_section'"> |
52 <dc:call-macro name="annotations"/> | 52 <dc:call-macro name="annotations"/> |
53 <dc:call-macro name="officiallines_user"/> | |
53 </dc:when> | 54 </dc:when> |
54 <dc:when test="$out = 'historical_discharge_wq'"> | 55 <dc:when test="$out = 'historical_discharge_wq'"> |
55 <dc:call-macro name="mainvalues"/> | 56 <dc:call-macro name="mainvalues"/> |
56 </dc:when> | 57 </dc:when> |
57 <dc:when test="$out = 'cross_section'"> | 58 <dc:when test="$out = 'cross_section'"> |
76 <dc:call-macro name="mainvalues"/> | 77 <dc:call-macro name="mainvalues"/> |
77 <dc:call-macro name="qsectors"/> | 78 <dc:call-macro name="qsectors"/> |
78 </dc:when> | 79 </dc:when> |
79 <dc:when test="$out = 'longitudinal_section'"> | 80 <dc:when test="$out = 'longitudinal_section'"> |
80 <dc:call-macro name="annotations"/> | 81 <dc:call-macro name="annotations"/> |
82 <dc:call-macro name="officiallines_user"/> | |
81 </dc:when> | 83 </dc:when> |
82 <dc:when test="$out = 'fix_longitudinal_section_curve'"> | 84 <dc:when test="$out = 'fix_longitudinal_section_curve'"> |
83 <dc:call-macro name="annotations"/> | 85 <dc:call-macro name="annotations"/> |
84 </dc:when> | 86 </dc:when> |
85 <dc:when test="$out = 'bed_difference_epoch'"> | 87 <dc:when test="$out = 'bed_difference_epoch'"> |
2320 <dc:macro name="officiallines_user"> | 2322 <dc:macro name="officiallines_user"> |
2321 <dc:if test="dc:contains($parameters, 'official-lines')"> | 2323 <dc:if test="dc:contains($parameters, 'official-lines')"> |
2322 <dc:container-context container="official-lines"> | 2324 <dc:container-context container="official-lines"> |
2323 <dc:properties> | 2325 <dc:properties> |
2324 <dc:property name="name" alias="olname"/> | 2326 <dc:property name="name" alias="olname"/> |
2325 <dc:property name="wst" alias="wstid"/> | 2327 <dc:property name="wstId" alias="wstid"/> |
2326 <dc:property name="columnPos" alias="wstcolpos"/> | 2328 <dc:property name="columnPos" alias="wstcolpos"/> |
2327 </dc:properties> | 2329 </dc:properties> |
2328 <dc:if test="dc:has-result()"> | 2330 <dc:if test="dc:has-result()"> |
2329 <officiallines> | 2331 <officiallines> |
2330 <dc:for-each> | 2332 <dc:for-each> |
2331 <dc:element name="${olname}"> | 2333 <column name="{$olname}" |
2332 <dc:attribute name="name" value="${olname}"/> | 2334 ids="additionals-wstv-{$wstcolpos}-{$wstid}" |
2333 <dc:attribute name="ids" value="additionals-wstv-${wstcolpos}-${wstid}"/> | 2335 factory="staticwqkms" target_out="{$out}"/> |
2334 <dc:attribute name="factory" value="staticwkms"/> | |
2335 <dc:attribute name="target_out" value="${out}"/> | |
2336 <dc:attribute name="out" value="${out}"/> | |
2337 </dc:element> | |
2338 </dc:for-each> | 2336 </dc:for-each> |
2339 </officiallines> | 2337 </officiallines> |
2340 </dc:if> | 2338 </dc:if> |
2341 </dc:container-context> | 2339 </dc:container-context> |
2342 </dc:if> | 2340 </dc:if> |