[Dive4elements-commits] [PATCH] Remove obsolete (duplicate) macro and its use

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1366871094 -7200
# Node ID a7df90f425e2d4e0bb44fe7cf762baaeedf881b9
# Parent  79717f1cf6eb79d2717df83bc759aaa203d2774f
Remove obsolete (duplicate) macro and its use.

diff -r 79717f1cf6eb -r a7df90f425e2 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed Apr 24 19:03:20 2013 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu Apr 25 08:24:54 2013 +0200
@@ -206,34 +206,6 @@
           </dc:call-macro>
         </dc:macro>
 
-        <dc:macro name="basedata_2_fixations_wst">
-          <dc:call-macro name="user-range">
-            <fixations>
-              <dc:context connection="system">
-                <dc:statement>
-                  SELECT id          AS prot_id,
-                         description AS prot_description
-                  FROM wsts WHERE kind = 2 AND river_id = ${river_id}
-                  ORDER BY prot_description
-                </dc:statement>
-                <dc:for-each>
-                  <fixation name="{dc:replace($prot_description, 'Fixierungen/', '')}">
-                    <!--dc:attribute name="ids" value="fixations-wstv-A-${prot_id}"/--><dc:context>
-                      <dc:call-macro name="SQL-wst_columns_statement"/>
-                      <dc:for-each>
-                        <column name="{$prot_column_name}"
-                                ids="fixations-wstv-{$prot_rel_pos}-{$prot_id}"
-                                factory="wqinterpol"
-                                info="{$info} [km {$deffrom} - {$defto}]"/>
-                      </dc:for-each>
-                    </dc:context>
-                  </fixation>
-                </dc:for-each>
-              </dc:context>
-            </fixations>
-          </dc:call-macro>
-        </dc:macro>
-
         <dc:macro name="basedata_2_fixations_wqkms">
           <dc:call-macro name="user-range">
             <fixations>
@@ -674,7 +646,7 @@
              </dc:if>
              <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
                <dc:call-macro name="mainvalues"/>
-               <dc:call-macro name="basedata_2_fixations_wst"/>
+               <dc:call-macro name="basedata_2_fixations_wqkms"/>
              </dc:if>
              <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
                <dc:call-macro name="mainvalues"/>
@@ -857,7 +829,7 @@
             </discharge_table_gauge>
           </discharge_table_nn>
 
-          <dc:call-macro name="basedata_2_fixations_wst"/>
+          <dc:call-macro name="basedata_2_fixations_wqkms"/>
 
           <dc:call-macro name="basedata_5_flood-protections"/>