diff flys-artifacts/doc/conf/meta-data.xml @ 4434:60c728e557f4

Backed out changeset e8a4d2fd25cc
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Wed, 07 Nov 2012 12:28:50 +0100
parents e8a4d2fd25cc
children 471baa410470
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml	Wed Nov 07 09:47:44 2012 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml	Wed Nov 07 12:28:50 2012 +0100
@@ -666,7 +666,7 @@
                  <dc:call-macro name="mainvalues"/>
                </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
-                       <!--dc:call-macro name="annotations"/-->
+                 <dc:call-macro name="annotations"/>
                  <dc:call-macro name="mainvalues"/>
                </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve')">
@@ -687,9 +687,6 @@
                <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
                  <dc:call-macro name="annotations"/>
                </dc:if>
-               <dc:if test="dc:contains($artifact-outs, 'sedimentload_ls')">
-                 <dc:call-macro name="annotations"/>
-               </dc:if>
             </dc:when>
             <dc:otherwise>
               <dc:comment>
@@ -730,9 +727,8 @@
               </dc:if>
 
               <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
-                      <!--dc:call-macro name="annotations"/-->>
+                <dc:call-macro name="annotations"/>
                 <!--dc:call-macro name="basedata_0"/-->
-                <dc:call-macro name="mainvalues"/>
                 <dc:call-macro name="basedata_1_additionals-relative_point"/>
                 <dc:comment comment=" FIXATIONS ---------------------------"/>
                 <dc:call-macro name="basedata_2_fixations_relative_point"/>
@@ -753,9 +749,6 @@
               <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
                 <dc:call-macro name="annotations"/>
               </dc:if>
-              <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
-                <dc:call-macro name="annotations"/>
-              </dc:if>
              <dc:comment comment="--- non-recommendations---"/>
             </dc:otherwise>
           </dc:choose>

http://dive4elements.wald.intevation.org