[Dive4elements-commits] [PATCH] Datacage: Removed macros which are not called

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1368371059 -7200
# Node ID a3060bfd28cf254fb9f18433e2cb2d2e7c0de21e
# Parent  e5e2b063085551c31f6677627d9441f58607f607
Datacage: Removed macros which are not called.

diff -r e5e2b0630855 -r a3060bfd28cf artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Sun May 12 16:15:37 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Sun May 12 17:04:19 2013 +0200
@@ -369,33 +369,6 @@
           </dc:call-macro>
         </dc:macro>
 
-        <dc:macro name="basedata_4_heightmarks-wq">
-          <dc:call-macro name="user-range">
-            <heightmarks>
-              <dc:context connection="system">
-                <dc:statement>
-                  SELECT id          AS prot_id,
-                         description AS prot_description
-                  FROM wsts WHERE kind = 4 AND river_id = ${river_id}
-                </dc:statement>
-                <dc:for-each>
-                  <heightmark name="{$prot_description}">
-                    <dc:context>
-                      <dc:call-macro name="SQL-wst_columns_statement"/>
-                      <dc:for-each>
-                        <column name="{$prot_column_name}"
-                                ids="heightmarks_annotations-wstv-{$prot_rel_pos}-{$prot_id}:OUT={$OUT}"
-                                factory="wqinterpol"
-                                info="{$info} [km {$deffrom} - {$defto}]"/>
-                      </dc:for-each>
-                    </dc:context>
-                  </heightmark>
-                </dc:for-each>
-              </dc:context>
-            </heightmarks>
-          </dc:call-macro>
-        </dc:macro>
-
         <dc:macro name="basedata_5_flood-protections_relative_points">
           <dc:call-macro name="user-range">
             <flood_protections id="flood-protections-{$river_id}">
@@ -2513,42 +2486,6 @@
               MINFO bedheight middle
             </dc:comment>
 
-            <dc:macro name="bed-height">
-              <fix_vollmer_wq_curve>
-                <dc:for-each>
-                  <dc:context>
-                    <dc:call-macro name="range-filter">
-                      <dc:context>
-                        <dc:statement>
-                          SELECT a.gid         AS aid,
-                                 f.id          AS fid,
-                                 f.name        AS facet_name,
-                                 f.num         AS facet_num,
-                                 f.description AS facet_description
-                          FROM outs AS o, facets AS f, artifacts AS a
-                          WHERE (
-                              f.name = 'longitudinal_section.w' OR 
-                              f.name = 'heightmarks_points'
-                          ) AND f.out_id = o.id AND o.artifact_id = ${a_id} AND a.id = ${a_id}
-                        </dc:statement>
-                        <fix_vollmer_wq_curve description="{$river} {$a_creation} {$collection_name}">
-                          <dc:for-each>
-                            <dc:element name="${facet_name}">
-                              <dc:attribute name="description" value="${facet_description}"/>
-                              <dc:attribute name="factory" value="fixanalysis"/>
-                              <dc:attribute name="artifact-id" value="${aid}"/>
-                              <dc:attribute name="ids" value="${facet_num}:OUT=${out}"/>
-                              <dc:attribute name="out" value="longitudinal_section"/>
-                            </dc:element>
-                          </dc:for-each>
-                        </fix_vollmer_wq_curve>
-                      </dc:context>
-                    </dc:call-macro>
-                  </dc:context>
-                </dc:for-each>
-              </fix_vollmer_wq_curve>
-            </dc:macro>
-
             <dc:macro name="floodmap-hws-user">
               <dc:context>
                 <dc:statement>
@@ -2930,53 +2867,6 @@
               </bedheight-differences>
             </dc:macro>
 
-            <dc:macro name="fixings-year">
-              <fixings>
-                <dc:for-each>
-                  <dc:context>
-                    <dc:call-macro name="range-filter">
-                      <dc:context>
-                        <dc:statement>
-                          SELECT ou.id AS oid
-                          FROM outs AS ou, artifacts AS ar
-                          WHERE
-                            ar.state = 'state.fix.vollmer.compute' AND
-                            ou.name = 'longitudinal_section'
-                        </dc:statement>
-                        <dc:for-each>
-                          <fix description="{$river} {$a_id} {$a_creation} {$collection_name}">
-                            <dc:context>
-                              <dc:statement>
-                                SELECT a.gid         AS aid,
-                                       f.id          AS fid,
-                                       f.name        AS facet_name,
-                                       f.num         AS facet_num,
-                                       f.description AS facet_description
-                                FROM outs AS o, facets AS f, artifacts AS a
-                                WHERE f.name = 'longitudinal_section.w' AND
-                                      f.out_id = o.id         AND
-                                      o.artifact_id = ${a_id} AND
-                                      a.id = ${a_id}
-                              </dc:statement>
-                              <dc:for-each>
-                                <dc:element name="${facet_name}">
-                                  <dc:attribute name="factory" value="fixanalysis"/>
-                                  <dc:attribute name="description" value="${facet_description}"/>
-                                  <dc:attribute name="ids" value="${facet_num}-${facet_name}:OUT=${out}"/>
-                                  <dc:attribute name="artifact-id" value="${aid}"/>
-                                  <dc:attribute name="out" value="longitudinal_section"/>
-                                </dc:element>
-                              </dc:for-each>
-                            </dc:context>
-                          </fix>
-                        </dc:for-each>
-                      </dc:context>
-                    </dc:call-macro>
-                  </dc:context>
-                </dc:for-each>
-              </fixings>
-            </dc:macro>
-
             <dc:macro name="waterlevels-discharge">
               <waterlevels-discharge>
                 <dc:for-each>