[PATCH] Datacage: Consequently call macro 'longitudinal-section-user-prototype' in all longitudinal sections of old calculation. Moved asymmeterical stuff to prototype. This may crash!

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1382520505 -7200
# Node ID cae7c0625436d71cdb7af0060cf1f107f828b413
# Parent  6665d0e3d795de8ca2aabe6685926b8b8a85bb55
Datacage: Consequently call macro 'longitudinal-section-user-prototype' in all longitudinal sections of old calculation. Moved asymmeterical stuff to prototype. This may crash!

diff -r 6665d0e3d795 -r cae7c0625436 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Wed Oct 23 11:04:06 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed Oct 23 11:28:25 2013 +0200
@@ -354,11 +354,10 @@
                       <dc:call-macro name="duration-curve"/>
                     </dc:when>
                     <dc:when test="$out = 'differenceable'">
-                      <dc:call-macro name="differenceable-fix"/>
-                      <dc:call-macro name="differences"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'waterlevels'">
-                      <dc:call-macro name="waterlevels-fix"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'floodmap'">
                       <dc:call-macro name="flood-map"/>
@@ -367,42 +366,25 @@
                       <dc:call-macro name="flood-map"/>
                     </dc:when>
                     <dc:when test="$out = 'bedheight_middle'">
-                      <dc:call-macro name="waterlevels-discharge"/>
-                      <dc:call-macro name="differenceable-fix"/>
-                      <dc:call-macro name="differences"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'floodmap-hws'">
                       <dc:call-macro name="floodmap-hws-user"/>
                     </dc:when>
                     <dc:when test="$out = 'flow_velocity'">
-                      <dc:call-macro name="bedquality-bed"/>
-                      <dc:call-macro name="bedquality-load"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'bed_longitudinal_section'">
-                      <dc:call-macro name="bedquality-bed"/>
-                      <dc:call-macro name="bedquality-load"/>
-                      <dc:call-macro name="bedquality-density"/>
-                      <dc:call-macro name="bedquality-porosity"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'sedimentload_ls'">
-                      <dc:call-macro name="differences"/>
-                      <dc:call-macro name="bedheight_differences"/>
-                      <dc:call-macro name="flow-velocity"/>
-                      <dc:call-macro name="sediment-load"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'bed_difference_year'">
-                      <dc:call-macro name="waterlevels-discharge"/>
-                      <dc:call-macro name="bedheight_differences"/>
-                      <dc:call-macro name="differences"/>
-                      <dc:call-macro name="waterlevels-fix"/>
-                      <dc:call-macro name="delta-wt-ls"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="$out = 'bed_difference_epoch'">
-                      <dc:call-macro name="waterlevels-discharge"/>
-                      <dc:call-macro name="bedheight_differences"/>
-                      <dc:call-macro name="differences"/>
-                      <dc:call-macro name="waterlevels-fix"/>
-                      <dc:call-macro name="delta-wt-ls"/>
+                      <dc:call-macro name="longitudinal-section-user-prototype"/>
                     </dc:when>
                     <dc:when test="starts-with($out, 'sq_relation')">
                       <dc:call-macro name="sqrelations_user"/>
@@ -1311,20 +1293,36 @@
     </dc:macro>
 
     <dc:macro name="longitudinal-section-user-prototype">
-       <dc:comment> WINFO/DIFF/FIX </dc:comment>
-       <dc:call-macro name="longitudinal"/>
-       <dc:call-macro name="differences"/>
-       <dc:call-macro name="waterlevels-discharge"/>
-       <dc:call-macro name="longitudinal-section-fix"/>
-       <dc:call-macro name="delta-wt-ls"/>
-       <dc:comment> MINFO </dc:comment>
-       <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:comment> WINFO/DIFF/FIX </dc:comment>
+      <dc:call-macro name="longitudinal"/>
+      <dc:call-macro name="differences"/>
+      <dc:call-macro name="waterlevels-discharge"/>
+      <dc:call-macro name="longitudinal-section-fix"/>
+      <dc:call-macro name="delta-wt-ls"/>
+      <dc:comment> MINFO </dc:comment>
+      <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:comment> UNSORTED </dc:comment>
+      <dc:comment> From 'differenceable' </dc:comment>
+      <dc:call-macro name="differenceable-fix"/>
+      <dc:comment> From 'waterlevels' </dc:comment>
+      <dc:call-macro name="waterlevels-fix"/>
+      <dc:comment> From 'bedheight_middle' </dc:comment>
+      <dc:call-macro name="waterlevels-discharge"/>
+      <dc:call-macro name="differenceable-fix"/>
+      <dc:comment> From 'flow_velocity' </dc:comment>
+      <dc:call-macro name="bedquality-bed"/>
+      <dc:call-macro name="bedquality-load"/>
+      <dc:comment> From 'bed_longitudinal_section' </dc:comment>
+      <dc:comment> From 'sedimentload_ls' </dc:comment>
+      <dc:comment> From 'bed_difference_year' </dc:comment>
+      <dc:call-macro name="waterlevels-fix"/>
+      <dc:comment> From 'bed_difference_epoch' </dc:comment>
     </dc:macro>