[PATCH 2 of 2] issue1397: Fix reference_curve former calculations in dc
Wald Commits
scm-commit at wald.intevation.org
Tue Oct 29 11:32:53 CET 2013
# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1383042776 -3600
# Node ID 1d37d324eedc8c34d73a6a7e099980e0574437e7
# Parent 1d35db228c751bf38b841e0fa286e2a2d830a486
issue1397: Fix reference_curve former calculations in dc.
diff -r 1d35db228c75 -r 1d37d324eedc artifacts/doc/conf/meta-data.xml
--- 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>
More information about the Dive4elements-commits
mailing list