diff artifacts/doc/conf/meta-data.xml @ 6046:4493ef20d357

merged
author Tom Gottfried <tom@intevation.de>
date Thu, 16 May 2013 18:04:35 +0200
parents 490b12d070a2
children a18aafc1372f
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Thu May 16 18:03:39 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu May 16 18:04:35 2013 +0200
@@ -566,13 +566,13 @@
               <dc:for-each>
                 <dc:context>
                   <dc:statement>
-                    SELECT min(station) AS from,
-                           max(station) AS to
+                    SELECT min(station) AS from_station,
+                           max(station) AS to_station
                     FROM morphologic_width_values
                     WHERE morphologic_width_id = ${width_id}
                   </dc:statement>
                   <dc:for-each>
-                    <morphologic-width name="{$from} - {$to}"
+                    <morphologic-width name="{$from_station} - {$to_station}"
                                        ids="{$width_id}"
                                        factory="morph-width"/>
                   </dc:for-each>
@@ -710,6 +710,9 @@
                   <dc:call-macro name="cross_sections"/>
                   <dc:call-macro name="hyks"/>
                 </dc:when>
+                <dc:when test="$out = 'discharge_curve'">
+                  <dc:call-macro name="mainvalues"/>
+                </dc:when>
                 <dc:when test="$out = 'computed_discharge_curve'">
                   <dc:call-macro name="mainvalues"/>
                   <dc:call-macro name="basedata_2_fixations_wqkms"/>
@@ -787,6 +790,9 @@
                 <dc:when test="$out = 'discharge_longitudinal_section'">
                   <dc:call-macro name="longitudinal-section-prototype"/>
                 </dc:when>
+                <dc:when test="$out = 'discharge_curve'">
+                  <dc:call-macro name="mainvalues"/>
+                </dc:when>
                 <dc:when test="$out = 'duration_curve'">
                   <dc:call-macro name="mainvalues"/>
                   <dc:call-macro name="basedata_2_fixations_relative_point"/>

http://dive4elements.wald.intevation.org