Mercurial > dive4elements > river
changeset 6587:d553c4a1829d
issue1394: Prevent display of empty paths in DC tree (vollmer and waterlevels).
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 17 Jul 2013 15:11:37 +0200 |
| parents | 16c614d68e19 |
| children | 0388fa73567f |
| files | artifacts/doc/conf/meta-data.xml |
| diffstat | 1 files changed, 26 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- 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>