comparison flys-artifacts/doc/conf/meta-data.xml @ 4146:5589b1fd459d

Merged.
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 16 Oct 2012 11:28:33 +0200
parents 58864f4f6e3b
children f54223644814
comparison
equal deleted inserted replaced
4145:d39f229ea990 4146:5589b1fd459d
78 </dc:context> 78 </dc:context>
79 </basedata> 79 </basedata>
80 </dc:elements> 80 </dc:elements>
81 </dc:context> 81 </dc:context>
82 </basedata> 82 </basedata>
83 </dc:macro>
84
85 <dc:macro name="basedata_1_additionals_marks">
86 <dc:comment comment=".ZUS -------------------------------"/>
87 <additionals>
88 <dc:context>
89 <dc:statement>
90 SELECT id AS prot_id,
91 description AS prot_description
92 FROM wsts WHERE kind = 1 AND river_id = ${river_id}
93 </dc:statement>
94 <dc:elements>
95 <additional>
96 <dc:attribute name="name" value="${prot_description}"/>
97 <dc:context>
98 <dc:statement>
99 SELECT id AS prot_column_id,
100 name AS prot_column_name,
101 position AS prot_rel_pos,
102 description AS info
103 FROM wst_columns WHERE wst_id = ${prot_id}
104 ORDER by position
105 </dc:statement>
106 <dc:elements>
107 <column>
108 <dc:attribute name="name" value="${prot_column_name}"/>
109 <dc:attribute name="ids" value="additionalsmarks-wstv-${prot_rel_pos}-${prot_id}"/>
110 <dc:attribute name="factory" value="staticwkms"/>
111 <dc:attribute name="info" value="${info}"/>
112 </column>
113 </dc:elements>
114 </dc:context>
115 </additional>
116 </dc:elements>
117 </dc:context>
118 </additionals>
83 </dc:macro> 119 </dc:macro>
84 120
85 <dc:macro name="basedata_1_additionals"> 121 <dc:macro name="basedata_1_additionals">
86 <dc:comment comment=".ZUS -------------------------------"/> 122 <dc:comment comment=".ZUS -------------------------------"/>
87 <additionals> 123 <additionals>
697 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/> 733 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
698 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> 734 <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
699 </dc:if> 735 </dc:if>
700 <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')"> 736 <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')">
701 <dc:call-macro name="basedata_0_wq"/> 737 <dc:call-macro name="basedata_0_wq"/>
702 <dc:call-macro name="basedata_1_additionals"/> 738 <dc:call-macro name="basedata_1_additionals_marks"/>
703 <dc:call-macro name="basedata_2_fixations_wqkms"/> 739 <dc:call-macro name="basedata_2_fixations_wqkms"/>
704 <dc:call-macro name="basedata_3_officials"/> 740 <dc:call-macro name="basedata_3_officials"/>
705 <dc:call-macro name="basedata_4_heightmarks-points"/> 741 <dc:call-macro name="basedata_4_heightmarks-points"/>
706 <dc:call-macro name="basedata_5_flood-protections_relative_points"/> 742 <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
707 </dc:if> 743 </dc:if>

http://dive4elements.wald.intevation.org