diff flys-artifacts/doc/conf/meta-data.xml @ 4133:c722c08cf502

Merged heads.
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 15 Oct 2012 09:31:50 +0200
parents e0354aed0cd3
children 58864f4f6e3b
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml	Mon Oct 15 09:29:25 2012 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Mon Oct 15 09:31:50 2012 +0200
@@ -320,7 +320,7 @@
                         <column>
                           <dc:attribute name="name" value="${prot_column_name}"/>
                           <dc:attribute name="ids" value="additionals-wstv-${prot_rel_pos}-${prot_id}"/>
-                          <dc:attribute name="factory" value="staticwkms"/>
+                          <dc:attribute name="factory" value="staticwqkms"/>
                           <dc:attribute name="info" value="${info}"/>
                         </column>
                       </dc:elements>
@@ -490,24 +490,22 @@
                   <dc:attribute name="name" value="${prot_description}"/>
                   <dc:attribute name="db-id" value="${prot_id}"/>
                   <dc:attribute name="factory" value="staticwkms"/>
-                  <columns>
-                    <dc:context>
-                      <dc:statement>
-                        SELECT id       AS prot_column_id,
-                               name     AS prot_column_name,
-                               position AS prot_rel_pos
-                        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="flood_protection-wstv-${prot_rel_pos}-${prot_id}"/>
-                          <dc:attribute name="factory" value="staticwkms"/>
-                        </column>
-                      </dc:elements>
-                    </dc:context>
-                  </columns>
+                  <dc:context>
+                    <dc:statement>
+                      SELECT id       AS prot_column_id,
+                             name     AS prot_column_name,
+                             position AS prot_rel_pos
+                      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="flood_protection-wstv-${prot_rel_pos}-${prot_id}"/>
+                        <dc:attribute name="factory" value="staticwkms"/>
+                      </column>
+                    </dc:elements>
+                  </dc:context>
                 </flood_protection>
               </dc:elements>
             </dc:context>
@@ -519,6 +517,14 @@
             <dc:attribute name="factory" value="mainvalue"/>
             <dc:attribute name="ids"     value="${river_id}"/>
           </mainvalue>
+          <wmainvalue>
+            <dc:attribute name="factory" value="mainvalue"/>
+            <dc:attribute name="ids"     value="${river_id}:w"/>
+          </wmainvalue>
+          <qmainvalue>
+            <dc:attribute name="factory" value="mainvalue"/>
+            <dc:attribute name="ids"     value="${river_id}:q"/>
+          </qmainvalue>
         </dc:macro>
 
         <dc:macro name="qsectors">
@@ -538,6 +544,11 @@
         <dc:macro name="annotations_per_type">
           <annotations>
             <dc:context>
+              <annotation>
+                <dc:attribute name="name"    value="all_annotations"/>
+                <dc:attribute name="factory" value="annotations"/>
+                <dc:attribute name="ids"     value="${river_id}"/>
+              </annotation>
               <dc:statement>
                 SELECT id          AS anno_id,
                        name AS anno_description
@@ -615,6 +626,9 @@
                  <dc:call-macro name="cross_sections"/>
                  <dc:call-macro name="hyks"/>
                </dc:if>
+               <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
+                 <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="mainvalues"/>
@@ -669,31 +683,33 @@
                  <dc:call-macro name="basedata_4_heightmarks-points"/>
                  <dc:comment comment=" AMTL LINIEN  ---------------------------"/>
                  <dc:call-macro name="basedata_3_officials"/>
+                 <dc:call-macro name="basedata_5_flood-protections"/>
                  <dc:call-macro name="annotations_per_type"/>
               </dc:if>
-               <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
-                 <dc:call-macro name="annotations"/>
-                 <!--dc:call-macro name="basedata_0"/-->
-                 <dc:call-macro name="basedata_1_additionals-relative_point"/>
-                 <dc:comment comment=" FIXATIONS ---------------------------"/>
-                 <dc:call-macro name="basedata_2_fixations_relative_point"/>
-                 <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
-                 <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
-                 <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
-               </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_2_fixations"/>
-                 <dc:call-macro name="basedata_3_officials"/>
-                 <dc:call-macro name="basedata_4_heightmarks-points"/>
-                 <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
-               </dc:if>
-               <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')">
-               </dc:if>
-               <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, 'reference_curve')">
+                <dc:call-macro name="annotations"/>
+                <!--dc:call-macro name="basedata_0"/-->
+                <dc:call-macro name="basedata_1_additionals-relative_point"/>
+                <dc:comment comment=" FIXATIONS ---------------------------"/>
+                <dc:call-macro name="basedata_2_fixations_relative_point"/>
+                <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
+                <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+                <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+              </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_2_fixations_wqkms"/>
+                <dc:call-macro name="basedata_3_officials"/>
+                <dc:call-macro name="basedata_4_heightmarks-points"/>
+                <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+              </dc:if>
+              <dc:if test="dc:contains($artifact-outs, 'fix_deltawt_curve')">
+              </dc:if>
+              <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
+                <dc:call-macro name="annotations"/>
+              </dc:if>
              <dc:comment comment="--- non-recommendations---"/>
             </dc:otherwise>
           </dc:choose>
@@ -825,13 +841,6 @@
               </discharge_table_nn>
           </dc:if>
 
-          <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
-
-              <longitudinal_section>
-                <dc:call-macro name="annotations"/>
-              </longitudinal_section>
-          </dc:if>
-
           <dc:if test="dc:contains($artifact-outs, 'map')">
               <map>
               <dc:choose>

http://dive4elements.wald.intevation.org