Mercurial > dive4elements > river
diff flys-artifacts/doc/conf/meta-data.xml @ 2717:4cd55689e9a9
Allow to load previous DurationCurves and fixations in Dur.C. via DC.
flys-artifacts/trunk@4446 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 21 May 2012 09:02:58 +0000 |
parents | 15c6f79ca3e2 |
children | f1c639493941 |
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml Fri May 18 12:44:20 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Mon May 21 09:02:58 2012 +0000 @@ -505,7 +505,15 @@ </dc:if> <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> - <dc:call-macro name="mainvalues"/> + <dc:choose> + <dc:when test="dc:contains($parameters, 'recommended')"> + <dc:call-macro name="mainvalues"/> + </dc:when> + <dc:otherwise> + <dc:call-macro name="mainvalues"/> + <dc:call-macro name="basedata_2_fixations"/> + </dc:otherwise> + </dc:choose> </dc:if> <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')"> @@ -1092,7 +1100,7 @@ <dc:statement> SELECT a.gid as aid, f.id AS fid, f.name AS facet_name, f.num AS facet_num, f.description as facet_description FROM outs as o, facets as f, artifacts as a - WHERE f.name = 'duration_curve.q' and f.out_id = o.id and o.artifact_id = ${a_id} and a.id = ${a_id} + WHERE (f.name = 'duration_curve.q' or f.name = 'duration_curve.w') and f.out_id = o.id and o.artifact_id = ${a_id} and a.id = ${a_id} </dc:statement> <dc:elements> <dc:element name="${facet_name}">