[PATCH 3 of 4] Fix wrong usage of a_id and add more datacage stuff to WSPL longitundinal

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1380215677 -7200
# Node ID 336d7690b38c70d5d32314120cd6a757258a4de9
# Parent  1a938a5a7e213c7ca1d530dffc63f20513a0fed8
Fix wrong usage of a_id and add more datacage stuff to WSPL longitundinal

diff -r 1a938a5a7e21 -r 336d7690b38c artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Sep 26 19:13:42 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Sep 26 19:14:37 2013 +0200
@@ -141,6 +141,7 @@
                   </dc:when>
                   <dc:when test="$out = 'longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
+                    <dc:call-macro name="bedheight_differences"/>
                   </dc:when>
                   <dc:when test="$out = 'w_differences'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
@@ -354,6 +355,16 @@
                       <dc:call-macro name="longitudinal"/>
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="bedheight_differences"/>
+                      <dc:call-macro name="bedquality-bed"/>
+                      <dc:call-macro name="bedquality-load"/>
+                      <dc:call-macro name="flow-velocity"/>
+                      <dc:call-macro name="sediment-load"/>
+                      <dc:call-macro name="bedquality-density"/>
+                      <dc:call-macro name="bedquality-porosity"/>
+                      <dc:call-macro name="waterlevels-discharge"/>
+                      <dc:call-macro name="differenceable-fix"/>
+                      <dc:call-macro name="delta-wt-ls"/>
+                      <dc:call-macro name="longitudinal-section"/>
                     </dc:when>
                     <dc:when test="$out = 'discharge_longitudinal_section'">
                       <dc:call-macro name="longitudinal"/>
@@ -876,7 +887,7 @@
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="bed_longitudinal_section"/>
                   </dc:element>
                 </dc:for-each>
@@ -900,7 +911,7 @@
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="bed_longitudinal_section"/>
                   </dc:element>
                 </dc:for-each>
@@ -925,7 +936,7 @@
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="bed_longitudinal_section"/>
                   </dc:element>
                 </dc:for-each>
@@ -950,7 +961,7 @@
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="bed_longitudinal_section"/>
                   </dc:element>
                 </dc:for-each>
@@ -977,7 +988,7 @@
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="flow_velocity"/>
                   </dc:element>
                 </dc:for-each>
@@ -1000,7 +1011,7 @@
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="sedimentload_ls"/>
                   </dc:element>
                 </dc:for-each>
@@ -1039,7 +1050,7 @@
       <dc:filter expr="$out_name = 'discharge_longitudinal_section' and $facet_name = 'discharge_longitudinal_section.w'">
         <dc:if test="dc:has-result()">
           <waterlevels-discharge>
-            <dc:group expr="concat($oid, ' ', $river, ' ', $a_id, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
+            <dc:group expr="concat($oid, ' ', $river, ' ', $a_gid, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
               <discharge description="{dc:group-key()}">
                 <dc:for-each>
                   <dc:element name="${facet_name}">
@@ -1047,7 +1058,7 @@
                     <dc:attribute name="target_out" value="${out}"/>
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
-                    <dc:attribute name="artifact-id" value="${a_id}"/>
+                    <dc:attribute name="artifact-id" value="${a_gid}"/>
                     <dc:attribute name="out" value="longitudinal_section"/>
                   </dc:element>
                 </dc:for-each>