Mercurial > dive4elements > river

comparison flys-artifacts/doc/conf/meta-data.xml @ 5822:a7df90f425e2 before-dive4elements-move

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove obsolete (duplicate) macro and its use.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 25 Apr 2013 08:24:54 +0200
parents e4d0e80ae404
children
comparison
equal deleted inserted replaced
5821:79717f1cf6eb 5822:a7df90f425e2
204 </dc:context> 204 </dc:context>
205 </additionals> 205 </additionals>
206 </dc:call-macro> 206 </dc:call-macro>
207 </dc:macro> 207 </dc:macro>
208 208
209 <dc:macro name="basedata_2_fixations_wst">
210 <dc:call-macro name="user-range">
211 <fixations>
212 <dc:context connection="system">
213 <dc:statement>
214 SELECT id AS prot_id,
215 description AS prot_description
216 FROM wsts WHERE kind = 2 AND river_id = ${river_id}
217 ORDER BY prot_description
218 </dc:statement>
219 <dc:for-each>
220 <fixation name="{dc:replace($prot_description, 'Fixierungen/', '')}">
221 <!--dc:attribute name="ids" value="fixations-wstv-A-${prot_id}"/--><dc:context>
222 <dc:call-macro name="SQL-wst_columns_statement"/>
223 <dc:for-each>
224 <column name="{$prot_column_name}"
225 ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}"
226 factory="wqinterpol"
227 info="{$info} [km {$deffrom} - {$defto}]"/>
228 </dc:for-each>
229 </dc:context>
230 </fixation>
231 </dc:for-each>
232 </dc:context>
233 </fixations>
234 </dc:call-macro>
235 </dc:macro>
236
237 <dc:macro name="basedata_2_fixations_wqkms"> 209 <dc:macro name="basedata_2_fixations_wqkms">
238 <dc:call-macro name="user-range"> 210 <dc:call-macro name="user-range">
239 <fixations> 211 <fixations>
240 <dc:context connection="system"> 212 <dc:context connection="system">
241 <dc:statement> 213 <dc:statement>
672 <dc:call-macro name="cross_sections"/> 644 <dc:call-macro name="cross_sections"/>
673 <dc:call-macro name="hyks"/> 645 <dc:call-macro name="hyks"/>
674 </dc:if> 646 </dc:if>
675 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"> 647 <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
676 <dc:call-macro name="mainvalues"/> 648 <dc:call-macro name="mainvalues"/>
677 <dc:call-macro name="basedata_2_fixations_wst"/> 649 <dc:call-macro name="basedata_2_fixations_wqkms"/>
678 </dc:if> 650 </dc:if>
679 <dc:if test="dc:contains($artifact-outs, 'duration_curve')"> 651 <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
680 <dc:call-macro name="mainvalues"/> 652 <dc:call-macro name="mainvalues"/>
681 </dc:if> 653 </dc:if>
682 <dc:if test="dc:contains($artifact-outs, 'reference_curve')"> 654 <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
855 </dc:for-each> 827 </dc:for-each>
856 </dc:context> 828 </dc:context>
857 </discharge_table_gauge> 829 </discharge_table_gauge>
858 </discharge_table_nn> 830 </discharge_table_nn>
859 831
860 <dc:call-macro name="basedata_2_fixations_wst"/> 832 <dc:call-macro name="basedata_2_fixations_wqkms"/>
861 833
862 <dc:call-macro name="basedata_5_flood-protections"/> 834 <dc:call-macro name="basedata_5_flood-protections"/>
863 835
864 <!-- former waterlevels --> 836 <!-- former waterlevels -->
865 <dc:call-macro name="basedata_0"/> 837 <dc:call-macro name="basedata_0"/>
http://dive4elements.wald.intevation.org