[Dive4elements-commits] [PATCH 3 of 5] meta-data.xml: Moved duration-curve definitions into more appropriate places

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1354273311 -3600
# Node ID a44f56472d35e48145d184a3d82fbae61dc3ed13
# Parent  0b48085f93aaa9ae6483e661f7aec74f9708191f
meta-data.xml: Moved duration-curve definitions into more appropriate places.

diff -r 0b48085f93aa -r a44f56472d35 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 30 12:00:58 2012 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Nov 30 12:01:51 2012 +0100
@@ -711,6 +711,9 @@
                <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
                  <dc:call-macro name="mainvalues"/>
                </dc:if>
+               <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
+                 <dc:call-macro name="mainvalues"/>
+               </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                  <dc:call-macro name="annotations"/>
                  <dc:call-macro name="mainvalues"/>
@@ -771,7 +774,12 @@
                  <dc:call-macro name="basedata_5_flood-protections"/>
                  <dc:call-macro name="annotations_per_type"/>
               </dc:if>
-
+              <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
+                  <dc:call-macro name="mainvalues"/>
+                  <dc:call-macro name="basedata_2_fixations_relative_point"/>
+                  <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+                  <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+              </dc:if>
               <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                 <dc:call-macro name="annotations"/>
                 <!--dc:call-macro name="basedata_0"/-->
@@ -914,20 +922,6 @@
               </computed_discharge_curve>
           </dc:if>
 
-          <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
-            <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_relative_point"/>
-                  <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
-                  <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
-                </dc:otherwise>
-            </dc:choose>
-          </dc:if>
-
           <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve') and not (dc:contains($parameters, 'recommended'))">
               <discharge_table_nn>
                 <discharge_table_gauge>