Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 9546:abf4d0b10270
FlowDepths: DataCage AWSPL from "Betrieb und Unterhaltung"
author | gernotbelger |
---|---|
date | Fri, 19 Oct 2018 13:34:11 +0200 |
parents | b188255f08b3 |
children | 669ab639c56b |
comparison
equal
deleted
inserted
replaced
9545:f303d693a70f | 9546:abf4d0b10270 |
---|---|
674 <dc:macro-body/> | 674 <dc:macro-body/> |
675 </dc:group> | 675 </dc:group> |
676 </dc:macro> | 676 </dc:macro> |
677 | 677 |
678 <dc:macro name="longitudinal"> | 678 <dc:macro name="longitudinal"> |
679 <dc:filter expr="$out_name = 'longitudinal_section' and $a_state != 'state.fix.vollmer.compute'"> | 679 <dc:filter expr="$out_name = 'longitudinal_section' and $a_state != 'state.fix.vollmer.compute' and $a_state != 'state.bundu.vollmer.compute'"> |
680 <dc:if test="dc:has-result()"> | 680 <dc:if test="dc:has-result()"> |
681 <waterlevels_ls> | 681 <waterlevels_ls> |
682 <dc:call-macro name="collection-group"> | 682 <dc:call-macro name="collection-group"> |
683 <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment> | 683 <dc:comment>Aheinecke: Why is this grouping different from the rest?</dc:comment> |
684 <longitudinal_section_columns description="{dc:group-key()}"> | 684 <longitudinal_section_columns description="{dc:group-key()}"> |
698 </dc:if> | 698 </dc:if> |
699 </dc:filter> | 699 </dc:filter> |
700 </dc:macro> | 700 </dc:macro> |
701 | 701 |
702 <dc:macro name="longitudinal-section-fix-vollmer"> | 702 <dc:macro name="longitudinal-section-fix-vollmer"> |
703 <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and | 703 <dc:filter expr="($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and |
704 ($facet_name = 'longitudinal_section.w' or | 704 ($facet_name = 'longitudinal_section.w' or $facet_name = 'longitudinal_section.q')"> |
705 $facet_name = 'longitudinal_section.q') | |
706 "> | |
707 <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> | 705 <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> |
708 </dc:filter> | 706 </dc:filter> |
709 </dc:macro> | 707 </dc:macro> |
710 | 708 |
711 <dc:macro name="longitudinal-section-fix-vollmer_w"> | 709 <dc:macro name="longitudinal-section-fix-vollmer_w"> |
712 <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $facet_name = 'longitudinal_section.w'"> | 710 <dc:filter expr=" ($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and $facet_name = 'longitudinal_section.w'"> |
713 <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> | 711 <dc:call-macro name="longitudinal-section-fix-vollmer_macro"/> |
714 </dc:filter> | 712 </dc:filter> |
715 </dc:macro> | 713 </dc:macro> |
716 | 714 |
717 <dc:macro name="longitudinal-section-fix-vollmer_macro"> | 715 <dc:macro name="longitudinal-section-fix-vollmer_macro"> |
721 <waterlevels description="{dc:group-key()}"> | 719 <waterlevels description="{dc:group-key()}"> |
722 <dc:for-each> | 720 <dc:for-each> |
723 <dc:element name="${facet_name}"> | 721 <dc:element name="${facet_name}"> |
724 <dc:attribute name="description" value="${facet_description}"/> | 722 <dc:attribute name="description" value="${facet_description}"/> |
725 <dc:attribute name="ids" value="${facet_num}"/> | 723 <dc:attribute name="ids" value="${facet_num}"/> |
724 <!-- FIXME --> | |
726 <dc:attribute name="factory" value="fixanalysis"/> | 725 <dc:attribute name="factory" value="fixanalysis"/> |
726 <!-- bundu works due to same implementation | |
727 <dc:attribute name="factory" value="bundu"/> | |
728 --> | |
727 <dc:attribute name="target_out" value="${out}"/> | 729 <dc:attribute name="target_out" value="${out}"/> |
728 <dc:attribute name="artifact-id" value="${a_gid}"/> | 730 <dc:attribute name="artifact-id" value="${a_gid}"/> |
729 <dc:attribute name="out" value="longitudinal_section"/> | 731 <dc:attribute name="out" value="longitudinal_section"/> |
730 | 732 |
731 <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)"/> | 733 <dc:variable name="fixAnalysisYear" expr="dc:fix_analysis_year($a_gid)"/> |
936 </dc:macro> | 938 </dc:macro> |
937 | 939 |
938 <dc:comment comment="For building differences."/> | 940 <dc:comment comment="For building differences."/> |
939 <dc:macro name="differences-fix"> | 941 <dc:macro name="differences-fix"> |
940 <dc:comment comment="Vollmer curves need own factory"/> | 942 <dc:comment comment="Vollmer curves need own factory"/> |
941 <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and $facet_name = 'longitudinal_section.w'"> | 943 <dc:filter expr="($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and $facet_name = 'longitudinal_section.w'"> |
942 <dc:if test="dc:has-result()"> | 944 <dc:if test="dc:has-result()"> |
943 <vollmer_waterlevels> | 945 <vollmer_waterlevels> |
944 <dc:call-macro name="collection-group"> | 946 <dc:call-macro name="collection-group"> |
945 <waterlevels description="{dc:group-key()}"> | 947 <waterlevels description="{dc:group-key()}"> |
946 <dc:for-each> | 948 <dc:for-each> |
954 </dc:otherwise> | 956 </dc:otherwise> |
955 </dc:choose> | 957 </dc:choose> |
956 <dc:element name="${facet_name}"> | 958 <dc:element name="${facet_name}"> |
957 <dc:attribute name="description" value="${combined_desc}"/> | 959 <dc:attribute name="description" value="${combined_desc}"/> |
958 <dc:attribute name="ids" value="${facet_num}"/> | 960 <dc:attribute name="ids" value="${facet_num}"/> |
961 <!-- FIXME: different factories! --> | |
959 <dc:attribute name="factory" value="fixanalysis"/> | 962 <dc:attribute name="factory" value="fixanalysis"/> |
960 <dc:attribute name="target_out" value="${out}"/> | 963 <dc:attribute name="target_out" value="${out}"/> |
961 <dc:attribute name="artifact-id" value="${a_gid}"/> | 964 <dc:attribute name="artifact-id" value="${a_gid}"/> |
962 <dc:attribute name="out" value="longitudinal_section"/> | 965 <dc:attribute name="out" value="longitudinal_section"/> |
963 </dc:element> | 966 </dc:element> |
965 </waterlevels> | 968 </waterlevels> |
966 </dc:call-macro> | 969 </dc:call-macro> |
967 </vollmer_waterlevels> | 970 </vollmer_waterlevels> |
968 </dc:if> | 971 </dc:if> |
969 </dc:filter> | 972 </dc:filter> |
970 <dc:filter expr="not($a_state = 'state.fix.vollmer.compute') and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and | 973 <dc:filter expr="not($a_state = 'state.fix.vollmer.compute' or $a_state = 'state.bundu.vollmer.compute') and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and |
971 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))"> | 974 (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location')))"> |
972 <dc:if test="dc:has-result()"> | 975 <dc:if test="dc:has-result()"> |
973 <waterlevels> | 976 <waterlevels> |
974 <dc:call-macro name="collection-group"> | 977 <dc:call-macro name="collection-group"> |
975 <waterlevels description="{dc:group-key()}"> | 978 <waterlevels description="{dc:group-key()}"> |