Mercurial > dive4elements > river

comparison artifacts/doc/conf/meta-data.xml @ 6587:d553c4a1829d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5f0e3e9cf6f3
children 0388fa73567f
comparison
equal deleted inserted replaced
6586:16c614d68e19 6587:d553c4a1829d
729 <dc:comment comment="For building differences." /> 729 <dc:comment comment="For building differences." />
730 <dc:macro name="differenceable-fix"> 730 <dc:macro name="differenceable-fix">
731 <beddifferences> 731 <beddifferences>
732 <dc:call-macro name="bedheight-differences"/> 732 <dc:call-macro name="bedheight-differences"/>
733 </beddifferences> 733 </beddifferences>
734 <dc:filter expr="($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and 734 <dc:comment comment="Vollmer curves need own factory"/>
735 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location'))"> 735 <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
736 <dc:if test="dc:has-result()"> 736 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))">
737 <vollmer-waterlevels> 737 <dc:if test="dc:has-result()">
738 <vollmer_waterlevels>
738 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> 739 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
739 <waterlevels description="{dc:group-key()}"> 740 <waterlevels description="{dc:group-key()}">
740 <dc:for-each> 741 <dc:for-each>
741 <dc:choose> 742 <dc:choose>
742 <dc:when test="$ld_m = 'location'"> 743 <dc:when test="$ld_m = 'location'">
745 <dc:otherwise> 746 <dc:otherwise>
746 <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', 747 <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ',
747 $deffrom, ' bis KM ', $defto)"/> 748 $deffrom, ' bis KM ', $defto)"/>
748 </dc:otherwise> 749 </dc:otherwise>
749 </dc:choose> 750 </dc:choose>
750 <dc:comment comment="Vollmer curves need own factory"/> 751 <dc:element name="${facet_name}">
751 <dc:if test="$a_state = 'state.fix.vollmer.compute'"> 752 <dc:attribute name="description" value="${combined_desc}"/>
752 <dc:element name="${facet_name}"> 753 <dc:attribute name="ids" value="${facet_num}"/>
753 <dc:attribute name="description" value="${combined_desc}"/> 754 <dc:attribute name="factory" value="fixanalysis"/>
754 <dc:attribute name="ids" value="${facet_num}"/> 755 <dc:attribute name="target_out" value="${out}"/>
755 <dc:attribute name="factory" value="fixanalysis"/> 756 <dc:attribute name="artifact-id" value="${a_gid}"/>
756 <dc:attribute name="target_out" value="${out}"/> 757 <dc:attribute name="out" value="longitudinal_section"/>
757 <dc:attribute name="artifact-id" value="${a_gid}"/> 758 </dc:element>
758 <dc:attribute name="out" value="longitudinal_section"/>
759 </dc:element>
760 </dc:if>
761 </dc:for-each> 759 </dc:for-each>
762 </waterlevels> 760 </waterlevels>
763 </dc:group> 761 </dc:group>
764 </vollmer-waterlevels> 762 </vollmer_waterlevels>
763 </dc:if>
764 </dc:filter>
765 <dc:filter expr="not($a_state = 'state.fix.vollmer.compute') and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
766 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))">
767 <dc:if test="dc:has-result()">
765 <waterlevels> 768 <waterlevels>
766 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> 769 <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
767 <waterlevels description="{dc:group-key()}"> 770 <waterlevels description="{dc:group-key()}">
768 <dc:for-each> 771 <dc:for-each>
769 <dc:choose> 772 <dc:choose>
773 <dc:otherwise> 776 <dc:otherwise>
774 <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ', 777 <dc:variable name="combined_desc" expr="concat($facet_description, ' von KM ',
775 $deffrom, ' bis KM ', $defto)"/> 778 $deffrom, ' bis KM ', $defto)"/>
776 </dc:otherwise> 779 </dc:otherwise>
777 </dc:choose> 780 </dc:choose>
778 <dc:if test="not($a_state = 'state.fix.vollmer.compute')"> 781 <dc:element name="${facet_name}">
779 <dc:element name="${facet_name}"> 782 <dc:attribute name="description" value="${combined_desc}"/>
780 <dc:attribute name="description" value="${combined_desc}"/> 783 <dc:attribute name="ids" value="${facet_num}"/>
781 <dc:attribute name="ids" value="${facet_num}"/> 784 <dc:attribute name="factory" value="winfo"/>
782 <dc:attribute name="factory" value="winfo"/> 785 <dc:attribute name="target_out" value="${out}"/>
783 <dc:attribute name="target_out" value="${out}"/> 786 <dc:attribute name="artifact-id" value="${a_gid}"/>
784 <dc:attribute name="artifact-id" value="${a_gid}"/> 787 <dc:attribute name="out" value="longitudinal_section"/>
785 <dc:attribute name="out" value="longitudinal_section"/> 788 </dc:element>
786 </dc:element>
787 </dc:if>
788 </dc:for-each> 789 </dc:for-each>
789 </waterlevels> 790 </waterlevels>
790 </dc:group> 791 </dc:group>
791 </waterlevels> 792 </waterlevels>
792 </dc:if> 793 </dc:if>
http://dive4elements.wald.intevation.org