Mercurial > dive4elements > river

changeset 7280:2584a114a350

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue1345: Factored out description creation for loads. Make epochs show end time.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Thu, 10 Oct 2013 11:27:56 +0200
parents 237d5305b1a9
children 6c29c55dd85c
files artifacts/doc/conf/meta-data.xml
diffstat 1 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/meta-data.xml	Thu Oct 10 11:22:16 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Oct 10 11:27:56 2013 +0200
@@ -1309,7 +1309,7 @@
     <dc:macro name="epoch-load">
       <dc:for-each>
           <dc:variable name="syear" type="string" expr="dc:date-format('yyyy', $startyear)"/>
-          <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $stopyear)"/>
+          <dc:variable name="eyear" type="string" expr="dc:date-format('yyyy', $endyear)"/>
           <year description="{$syear}-${eyear}"
                  factory="sedimentyield"
                  target_out="{$out}"
@@ -1323,42 +1323,42 @@
        <dc:filter expr="$fraction='sand'">
          <dc:if test="dc:has-result()">
            <sand>
-             <dc:call-macro name="one-load"/>
+             <dc:macro-body/>
            </sand>
          </dc:if>
        </dc:filter>
        <dc:filter expr="$fraction='fine_middle'">
          <dc:if test="dc:has-result()">
            <fine_middle>
-             <dc:call-macro name="one-load"/>
+             <dc:macro-body/>
            </fine_middle>
          </dc:if>
        </dc:filter>
        <dc:filter expr="$fraction='coarse'">
          <dc:if test="dc:has-result()">
            <coarse>
-             <dc:call-macro name="one-load"/>
+             <dc:macro-body/>
            </coarse>
          </dc:if>
        </dc:filter>
        <dc:filter expr="$fraction='suspended_sediment'">
          <dc:if test="dc:has-result()">
            <susp_sediment>
-             <dc:call-macro name="one-load"/>
+             <dc:macro-body/>
            </susp_sediment>
          </dc:if>
        </dc:filter>
        <dc:filter expr="$fraction='susp_sand'">
          <dc:if test="dc:has-result()">
            <susp_sand>
-            <dc:call-macro name="one-load"/>
+             <dc:macro-body/>
            </susp_sand>
          </dc:if>
        </dc:filter>
        <dc:filter expr="$fraction='susp_sand_bed'">
          <dc:if test="dc:has-result()">
            <susp_sand_bed>
-             <dc:call-macro name="one-load"/>
+             <dc:macro-body/>
            </susp_sand_bed>
          </dc:if>
        </dc:filter>
@@ -1385,7 +1385,9 @@
                 AND syv.station BETWEEN ${fromkm} AND ${tokm}
             ORDER BY fraction
         </dc:statement>
-        <dc:call-macro name="loads"/>
+        <dc:call-macro name="loads">
+          <dc:call-macro name="one-load"/>
+        </dc:call-macro>
       </dc:context>
       </years>
       <epochs>
@@ -1407,10 +1409,11 @@
                 AND syv.station BETWEEN ${fromkm} AND ${tokm}
             ORDER BY fraction
         </dc:statement>
-        <dc:call-macro name="loads"/>
+        <dc:call-macro name="loads">
+          <dc:call-macro name="epoch-load"/>
+        </dc:call-macro>
       </dc:context>
       </epochs>
-
       </yields>
     </dc:macro>
http://dive4elements.wald.intevation.org