Mercurial > dive4elements > river
diff 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 |
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml Tue Oct 16 11:27:27 2012 +0200 +++ b/flys-artifacts/doc/conf/meta-data.xml Tue Oct 16 11:28:33 2012 +0200 @@ -82,6 +82,42 @@ </basedata> </dc:macro> + <dc:macro name="basedata_1_additionals_marks"> + <dc:comment comment=".ZUS -------------------------------"/> + <additionals> + <dc:context> + <dc:statement> + SELECT id AS prot_id, + description AS prot_description + FROM wsts WHERE kind = 1 AND river_id = ${river_id} + </dc:statement> + <dc:elements> + <additional> + <dc:attribute name="name" value="${prot_description}"/> + <dc:context> + <dc:statement> + SELECT id AS prot_column_id, + name AS prot_column_name, + position AS prot_rel_pos, + description AS info + FROM wst_columns WHERE wst_id = ${prot_id} + ORDER by position + </dc:statement> + <dc:elements> + <column> + <dc:attribute name="name" value="${prot_column_name}"/> + <dc:attribute name="ids" value="additionalsmarks-wstv-${prot_rel_pos}-${prot_id}"/> + <dc:attribute name="factory" value="staticwkms"/> + <dc:attribute name="info" value="${info}"/> + </column> + </dc:elements> + </dc:context> + </additional> + </dc:elements> + </dc:context> + </additionals> + </dc:macro> + <dc:macro name="basedata_1_additionals"> <dc:comment comment=".ZUS -------------------------------"/> <additionals> @@ -699,7 +735,7 @@ </dc:if> <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')"> <dc:call-macro name="basedata_0_wq"/> - <dc:call-macro name="basedata_1_additionals"/> + <dc:call-macro name="basedata_1_additionals_marks"/> <dc:call-macro name="basedata_2_fixations_wqkms"/> <dc:call-macro name="basedata_3_officials"/> <dc:call-macro name="basedata_4_heightmarks-points"/>