Mercurial > dive4elements > river
changeset 7491:deaf6e848635
issue1571: Hav eown folder in dc for vollmer curves.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 01 Nov 2013 11:13:38 +0100 |
| parents | 5775d14b3db2 |
| children | 4ad8f335d39b |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 32 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Fri Nov 01 11:12:38 2013 +0100 +++ b/artifacts/doc/conf/meta-data.xml Fri Nov 01 11:13:38 2013 +0100 @@ -566,15 +566,41 @@ </dc:filter> </dc:macro> + <dc:macro name="longitudinal-section-fix-common"> + </dc:macro> + + <dc:macro name="longitudinal-section-fix-vollmer"> + <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and + ($facet_name = 'longitudinal_section.w' or + $facet_name = 'longitudinal_section.q') + "> + <dc:if test="dc:has-result()"> + <waterlevels_fix_vollmer> + <dc:call-macro name="collection-group"> + <waterlevels description="{dc:group-key()}"> + <dc:for-each> + <dc:element name="${facet_name}"> + <dc:attribute name="description" value="${facet_description}"/> + <dc:attribute name="ids" value="${facet_num}"/> + <dc:attribute name="factory" value="fixanalysis"/> + <dc:attribute name="target_out" value="${out}"/> + <dc:attribute name="artifact-id" value="${a_gid}"/> + <dc:attribute name="out" value="longitudinal_section"/> + </dc:element> + </dc:for-each> + </waterlevels> + </dc:call-macro> + </waterlevels_fix_vollmer> + </dc:if> + </dc:filter> + </dc:macro> + <dc:macro name="longitudinal-section-fix"> <dc:filter expr="$out_name = 'fix_longitudinal_section_curve' and (starts-with($facet_name, 'fix_deviation_ls') or starts-with($facet_name, 'fix_sector_average_ls') or starts-with($facet_name, 'fix_analysis_events_ls') or - starts-with($facet_name, 'fix_reference_events_ls')) or - ($a_state = 'state.fix.vollmer.compute' and - ($facet_name = 'longitudinal_section.w' or - $facet_name = 'longitudinal_section.q')) + starts-with($facet_name, 'fix_reference_events_ls')) "> <dc:if test="dc:has-result()"> <waterlevels_fix> @@ -587,14 +613,7 @@ <dc:attribute name="factory" value="fixanalysis"/> <dc:attribute name="target_out" value="${out}"/> <dc:attribute name="artifact-id" value="${a_gid}"/> - <dc:choose> - <dc:when test="$a_state = 'state.fix.vollmer.compute'"> - <dc:attribute name="out" value="longitudinal_section"/> - </dc:when> - <dc:otherwise> - <dc:attribute name="out" value="fix_longitudinal_section_curve"/> - </dc:otherwise> - </dc:choose> + <dc:attribute name="out" value="fix_longitudinal_section_curve"/> </dc:element> </dc:for-each> </waterlevels> @@ -1242,6 +1261,7 @@ <dc:call-macro name="differences"/> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="longitudinal-section-fix"/> + <dc:call-macro name="longitudinal-section-fix-vollmer"/> <dc:comment> MINFO </dc:comment> <dc:call-macro name="bedheight_differences"/> <dc:call-macro name="bedquality"/>