changeset 4122:0b0192727265

In 'annotations per type' - section of DC, also add an 'all'-node.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 12 Oct 2012 17:02:49 +0200
parents f5e13feb35c5
children 30168be950a6
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml
diffstat 2 files changed, 20 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Oct 12 16:43:00 2012 +0200
+++ b/flys-artifacts/ChangeLog	Fri Oct 12 17:02:49 2012 +0200
@@ -1,3 +1,10 @@
+2012-10-12	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Improve on issue943/4
+
+	* flys-artifacts/doc/conf/meta-data.xml: Show an "all" node in DC
+	  for annotations per type.
+
 2012-10-12	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Fix issue943/3
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Oct 12 16:43:00 2012 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Oct 12 17:02:49 2012 +0200
@@ -536,6 +536,11 @@
         <dc:macro name="annotations_per_type">
           <annotations>
             <dc:context>
+              <annotation>
+                <dc:attribute name="name"    value="all"/>
+                <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
@@ -670,6 +675,14 @@
                  <dc:call-macro name="basedata_5_flood-protections"/>
                  <dc:call-macro name="annotations_per_type"/>
               </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, 'reference_curve')">
                  <dc:call-macro name="annotations"/>
                  <!--dc:call-macro name="basedata_0"/-->
@@ -824,13 +837,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