[PATCH 2 of 2] issue1394: Prevent display of empty paths in DC tree (vollmer and waterlevels)

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1374066697 -7200
# Node ID d553c4a1829d47aa57022681c0f62c2ea2c6905d
# Parent  16c614d68e1929c38942dbf68e5e94debadc20b0
issue1394: Prevent display of empty paths in DC tree (vollmer and waterlevels).

diff -r 16c614d68e19 -r d553c4a1829d artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Wed Jul 17 14:58:46 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed Jul 17 15:11:37 2013 +0200
@@ -731,10 +731,11 @@
       <beddifferences>
          <dc:call-macro name="bedheight-differences"/>
       </beddifferences>
-      <dc:filter expr="($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
-        (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location'))">
+      <dc:comment comment="Vollmer curves need own factory"/>
+      <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
+        (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))">
         <dc:if test="dc:has-result()">
-          <vollmer-waterlevels>
+          <vollmer_waterlevels>
             <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
               <waterlevels description="{dc:group-key()}">
                 <dc:for-each>
@@ -747,21 +748,23 @@
                         $deffrom, ' bis KM ', $defto)"/>
                     </dc:otherwise>
                  </dc:choose>
-                  <dc:comment comment="Vollmer curves need own factory"/>
-                  <dc:if test="$a_state = 'state.fix.vollmer.compute'">
-                    <dc:element name="${facet_name}">
-                      <dc:attribute name="description" value="${combined_desc}"/>
-                      <dc:attribute name="ids" value="${facet_num}"/>
-                      <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="longitudinal_section"/>
-                    </dc:element>
-                  </dc:if>
+                  <dc:element name="${facet_name}">
+                    <dc:attribute name="description" value="${combined_desc}"/>
+                    <dc:attribute name="ids" value="${facet_num}"/>
+                    <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="longitudinal_section"/>
+                  </dc:element>
                 </dc:for-each>
               </waterlevels>
             </dc:group>
-          </vollmer-waterlevels>
+          </vollmer_waterlevels>
+        </dc:if>
+      </dc:filter>
+      <dc:filter expr="not($a_state = 'state.fix.vollmer.compute') and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
+        (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))">
+        <dc:if test="dc:has-result()">
           <waterlevels>
             <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
                 <waterlevels description="{dc:group-key()}">
@@ -775,16 +778,14 @@
                           $deffrom, ' bis KM ', $defto)"/>
                       </dc:otherwise>
                     </dc:choose>
-                    <dc:if test="not($a_state = 'state.fix.vollmer.compute')">
-                      <dc:element name="${facet_name}">
-                        <dc:attribute name="description" value="${combined_desc}"/>
-                        <dc:attribute name="ids" value="${facet_num}"/>
-                        <dc:attribute name="factory" value="winfo"/>
-                        <dc:attribute name="target_out" value="${out}"/>
-                        <dc:attribute name="artifact-id" value="${a_gid}"/>
-                        <dc:attribute name="out" value="longitudinal_section"/>
-                      </dc:element>
-                    </dc:if>
+                    <dc:element name="${facet_name}">
+                      <dc:attribute name="description" value="${combined_desc}"/>
+                      <dc:attribute name="ids" value="${facet_num}"/>
+                      <dc:attribute name="factory" value="winfo"/>
+                      <dc:attribute name="target_out" value="${out}"/>
+                      <dc:attribute name="artifact-id" value="${a_gid}"/>
+                      <dc:attribute name="out" value="longitudinal_section"/>
+                    </dc:element>
                   </dc:for-each>
                 </waterlevels>
             </dc:group>