Mercurial > dive4elements > river
changeset 7457:1d37d324eedc
issue1397: Fix reference_curve former calculations in dc.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 29 Oct 2013 11:32:56 +0100 |
| parents | 1d35db228c75 |
| children | b2e167f193d7 |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 15 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml Tue Oct 29 11:31:59 2013 +0100 +++ b/artifacts/doc/conf/meta-data.xml Tue Oct 29 11:32:56 2013 +0100 @@ -430,19 +430,23 @@ </dc:macro> <dc:macro name="reference-curves"> - <dc:filter expr="$facet_name = 'reference_curve'"> + <dc:filter expr="$out = 'reference_curve' and $facet_name = 'reference_curve'"> <dc:if test="dc:has-result()"> <reference_curves> - <dc:for-each> - <dc:element name="${facet_name}"> - <dc:attribute name="description" value="${facet_description}"/> - <dc:attribute name="factory" value="winfo"/> - <dc:attribute name="target_out" value="${out}"/> - <dc:attribute name="artifact-id" value="${a_id}"/> - <dc:attribute name="ids" value="${a_id}"/> - <dc:attribute name="out" value="reference_curve"/> - </dc:element> - </dc:for-each> + <dc:call-macro name="collection-group"> + <ref_curve description="{dc:group-key()}"> + <dc:for-each> + <dc:element name="${facet_name}"> + <dc:attribute name="description" value="${facet_description}"/> + <dc:attribute name="factory" value="winfo"/> + <dc:attribute name="target_out" value="${out}"/> + <dc:attribute name="artifact-id" value="${a_gid}"/> + <dc:attribute name="ids" value="${facet_num}"/> + <dc:attribute name="out" value="reference_curve"/> + </dc:element> + </dc:for-each> + </ref_curve> + </dc:call-macro> </reference_curves> </dc:if> </dc:filter>