# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1368195878 -7200
# Node ID f33d717aae5ccd4027c17c106e2c4d3aed8586eb
# Parent  5159a7d8532000c1be38e5564ad18a5ed30ccd61
Revert changes in metadata.xml from r5978:ebd6e8e234e0.

diff -r 5159a7d85320 -r f33d717aae5c artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri May 10 15:45:40 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri May 10 16:24:38 2013 +0200
@@ -622,164 +622,7 @@
           <dc:call-macro name="annotations_per_type"/>
         </dc:macro>
 
-        <dc:comment>
-        + River-Node
-        </dc:comment>
-        <dc:attribute name="name" value="${river_name}"/>
-
-        <dc:choose>
-          <dc:when test="dc:contains($parameters, 'recommended')">
-             <dc:comment>
-                Recommendations (client shall load immediately).
-             </dc:comment>
-             <dc:if test="dc:contains($artifact-outs, 'w_differences') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
-               <dc:call-macro name="annotations"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'historical_discharge_wq')">
-               <dc:call-macro name="mainvalues"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'cross_section')">
-               <dc:call-macro name="cross_sections"/>
-               <dc:call-macro name="hyks"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
-               <dc:call-macro name="mainvalues"/>
-               <dc:call-macro name="basedata_2_fixations_wqkms"/>
-             </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"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')">
-               <dc:call-macro name="qsectors"/>
-               <dc:call-macro name="mainvalues"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
-               <dc:call-macro name="annotations"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
-               <dc:call-macro name="annotations"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'bed_difference_epoch')">
-               <dc:call-macro name="annotations"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'bed_difference_year')">
-               <dc:call-macro name="annotations"/>
-             </dc:if>
-             <dc:if test="dc:contains($artifact-outs, 'bed_difference_height_year')">
-               <dc:call-macro name="annotations"/>
-             </dc:if>
-          </dc:when>
-          <dc:otherwise>
-            <dc:comment>
-               Non - Recommendations.
-            </dc:comment>
-            <dc:if test="dc:contains($artifact-outs, 'cross_section')">
-               <dc:call-macro name="basedata_0"/>
-               <dc:call-macro name="basedata_1_additionals"/>
-               <dc:call-macro name="basedata_2_fixations"/>
-               <dc:call-macro name="basedata_3_officials"/>
-               <dc:call-macro name="basedata_4_heightmarks-points"/>
-               <dc:call-macro name="cross_sections"/>
-               <dc:call-macro name="hyks"/>
-            </dc:if>
-            <!--dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
-               <dc:call-macro name="basedata_0_wq"/>
-               <dc:call-macro name="basedata_4_heightmarks-wq"/>
-            </dc:if-->
-            <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')) or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
-                <dc:call-macro name="longitudinal-section-prototype"/>
-            </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"/-->
-              <dc:call-macro name="basedata_1_additionals-relative_point"/>
-              <dc:comment comment=" FIXATIONS ---------------------------"/>
-              <dc:call-macro name="basedata_2_fixations_relative_point"/>
-              <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
-              <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, 'fix_wq_curve')">
-              <dc:call-macro name="basedata_0_wq"/>
-              <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:if>
-            <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')">
-            </dc:if>
-            <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
-              <dc:call-macro name="annotations"/>
-            </dc:if>
-            <dc:if test="dc:contains($artifact-outs, 'map')">
-              <dc:call-macro name="flood-map-complete"/>
-            </dc:if>
-            <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
-              <dc:call-macro name="annotations_per_type"/>
-              <dc:call-macro name="flow_velocity_measurements"/>
-            </dc:if>
-            <dc:if test="dc:contains($artifact-outs, 'bed_longitudinal_section')">
-              <dc:call-macro name="annotations_per_type"/>
-            </dc:if>
-            <dc:if test="dc:contains($artifact-outs, 'sedimentload_ls')">
-              <dc:call-macro name="annotations_per_type"/>
-              <dc:call-macro name="morph_width"/>
-            </dc:if>
-            <dc:comment>
-              MINFO bedheight middle
-            </dc:comment>
-            <dc:if test="dc:contains($artifact-outs, 'bedheight_middle')">
-              <dc:call-macro name="sounding-width"/>
-              <dc:call-macro name="basedata_0"/>
-              <dc:call-macro name="basedata_1_additionals"/>
-              <dc:call-macro name="basedata_2_fixations"/>
-              <dc:call-macro name="basedata_3_officials"/>
-              <dc:call-macro name="annotations_per_type"/>
-            </dc:if>
-            <dc:if test="dc:contains($artifact-outs, 'bed_difference_year') or
-                         dc:contains($artifact-outs, 'bed_difference_epoch')">
-              <dc:call-macro name="basedata_0"/>
-              <dc:call-macro name="basedata_1_additionals"/>
-              <dc:call-macro name="basedata_2_fixations"/>
-              <dc:call-macro name="basedata_3_officials"/>
-              <dc:call-macro name="annotations_per_type"/>
-              <dc:call-macro name="morph_width"/>
-            </dc:if>
-           <dc:comment comment="--- non-recommendations---"/>
-          </dc:otherwise>
-        </dc:choose>
-
-        <dc:if test="dc:contains($artifact-outs, 'waterlevels')">
-
-          <!-- base data -->
-          <dc:call-macro name="basedata_0"/>
-
-          <!-- extra-longitudinal-sections -->
-          <dc:call-macro name="basedata_1_additionals"/>
-
-          <!-- fixations -->
-          <dc:call-macro name="basedata_2_fixations"/>
-
-          <!-- flood water marks-->
-          <dc:call-macro name="basedata_4_heightmarks-points"/>
-
-          <!-- flood protection -->
-          <dc:call-macro name="basedata_5_flood-protections"/>
-
-        </dc:if>
-
-        <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve') and not (dc:contains($parameters, 'recommended'))">
+        <dc:macro name="discharge_table_gauge">
           <discharge_table_nn>
             <discharge_table_gauge>
               <dc:context>