changeset 7365:4e055f92a8b3

issue1473: Let vollmer curves appear under 'former calc/waterlevels from fix.'.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 17 Oct 2013 07:42:31 +0200
parents 78862ae87121
children ea5da3e140ef
files artifacts/doc/conf/meta-data.xml
diffstat 1 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Thu Oct 17 07:39:42 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Oct 17 07:42:31 2013 +0200
@@ -568,7 +568,11 @@
         (starts-with($facet_name, 'fix_deviation_ls') or
         starts-with($facet_name, 'fix_sector_average_ls') or
         starts-with($facet_name, 'fix_analysis_events_ls') or
-        starts-with($facet_name, 'fix_reference_events_ls'))">
+        starts-with($facet_name, 'fix_reference_events_ls')) or
+        ($a_state = 'state.fix.vollmer.compute' and
+          ($facet_name = 'longitudinal_section.w' or
+           $facet_name = 'longitudinal_section.q'))
+        ">
         <dc:if test="dc:has-result()">
           <waterlevels_fix>
             <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
@@ -580,7 +584,14 @@
                     <dc:attribute name="factory" value="fixanalysis"/>
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="artifact-id" value="${a_gid}"/>
-                    <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
+                    <dc:choose>
+                      <dc:when test="$a_state = 'state.fix.vollmer.compute'">
+                        <dc:attribute name="out" value="longitudinal_section"/>
+                      </dc:when>
+                      <dc:otherwise>
+                        <dc:attribute name="out" value="fix_longitudinal_section_curve"/>
+                      </dc:otherwise>
+                    </dc:choose>
                   </dc:element>
                 </dc:for-each>
               </waterlevels>

http://dive4elements.wald.intevation.org