[PATCH 2 of 2] meta-data.xml: Refactored discharge-curve-prototype

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1381305660 -7200
# Node ID 1446bdb372c9eec7cac2b923ba3b6ba0541f812c
# Parent  36fa4c75200906fd5a2531c322c68db12eb00f9e
meta-data.xml: Refactored discharge-curve-prototype.

diff -r 36fa4c752009 -r 1446bdb372c9 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Wed Oct 09 09:57:49 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed Oct 09 10:01:00 2013 +0200
@@ -151,9 +151,7 @@
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
                   <dc:when test="$out = 'historical_discharge_wq'">
-                    <dc:call-macro name="historical_discharge_curve"/>
-                    <dc:call-macro name="discharge_table_gauge"/>
-                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
+                    <dc:call-macro name="discharge-curve-prototype"/>
                     <dc:call-macro name="basedata_5_flood-protections"/>
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
@@ -163,13 +161,9 @@
                     </computed_discharge_curve>
                   </dc:when>
                   <dc:when test="$out = 'discharge_curve'">
-                    <dc:call-macro name="historical_discharge_curve"/>
-                    <dc:call-macro name="discharge_table_gauge"/>
-                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
+                    <dc:call-macro name="discharge-curve-prototype"/>
+                    <dc:call-macro name="basedata_1_additionals_wq"/>
                     <dc:call-macro name="basedata_5_flood-protections"/>
-                    <dc:call-macro name="basedata_0_wq"/>
-                    <dc:call-macro name="basedata_1_additionals"/>
-                    <dc:call-macro name="basedata_4_heightmarks-points"/>
                     <computed_discharge_curve>
                       <dc:call-macro name="mainvalues"/>
                     </computed_discharge_curve>
@@ -189,13 +183,10 @@
                     <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
                   </dc:when>
                   <dc:when test="$out = 'fix_wq_curve'">
-                    <dc:call-macro name="historical_discharge_curve"/>
-                    <dc:call-macro name="discharge_table_gauge"/>
-                    <dc:call-macro name="basedata_0_wq"/>
+                    <dc:call-macro name="discharge-curve-prototype"/>
                     <dc:call-macro name="basedata_1_additionals_marks"/>
                     <dc:call-macro name="basedata_2_fixations_wqkms"/>
                     <dc:call-macro name="basedata_3_officials"/>
-                    <dc:call-macro name="basedata_4_heightmarks-points"/>
                     <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
                   </dc:when>
                   <dc:when test="$out = 'fix_longitudinal_section_curve'">
@@ -258,13 +249,10 @@
                     </dc:choose>
                   </dc:when>
                   <dc:when test="$out = 'computed_discharge_curve'">
-                    <dc:call-macro name="historical_discharge_curve"/>
-                    <dc:call-macro name="discharge_table_gauge"/>
-                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
+                    <dc:call-macro name="discharge-curve-prototype"/>
                     <dc:call-macro name="basedata_5_flood-protections"/>
                     <dc:call-macro name="basedata_0_wq"/>
                     <dc:call-macro name="basedata_1_additionals_wq"/>
-                    <dc:call-macro name="basedata_4_heightmarks-points"/>
                     <computed_discharge_curve>
                       <dc:call-macro name="mainvalues"/>
                     </computed_discharge_curve>
@@ -1210,6 +1198,14 @@
       </dc:filter>
     </dc:macro>
 
+    <dc:macro name="discharge-curve-prototype">
+        <dc:call-macro name="discharge_table_gauge"/>
+        <dc:call-macro name="historical_discharge_curve"/>
+        <dc:call-macro name="basedata_0_wq"/>
+        <dc:call-macro name="basedata_2_fixations_wqkms"/>
+        <dc:call-macro name="basedata_4_heightmarks-points"/>
+    </dc:macro>
+
     <dc:macro name="longitudinal-section-prototype">
       <dc:call-macro name="basedata_0"/>
       <dc:call-macro name="basedata_1_additionals"/>