[PATCH] Datacage: Moved year filtering of bed heights to separate macro to be reusable in other contextes

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1403098239 -7200
# Node ID a4764ab23eef21dce47a43c7650908a18907e339
# Parent  0f1a3bbfd2430541a8853a0518313ec4b28e3f36
Datacage: Moved year filtering of bed heights to separate macro to be reusable in other contextes.

diff -r 0f1a3bbfd243 -r a4764ab23eef artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Wed Jun 18 15:20:07 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Wed Jun 18 15:30:39 2014 +0200
@@ -1719,6 +1719,15 @@
     </dc:macro>
 
     <dc:macro name="minfo-heights">
+      <dc:call-macro name="minfo-heights-years">
+        <bedheights>
+          <dc:call-macro name="bed-heights-single"/>
+          <dc:call-macro name="bed-heights-epoch"/>
+        </bedheights>
+      </dc:call-macro>
+    </dc:macro>
+
+    <dc:macro name="minfo-heights-years">
         <dc:comment>
         The input here is a list differenc ids noted in the
         form:
@@ -1765,10 +1774,7 @@
           <dc:variable name="year_from" expr="0" type="number"/>
         </dc:otherwise>
       </dc:choose>
-      <bedheights>
-        <dc:call-macro name="bed-heights-single"/>
-        <dc:call-macro name="bed-heights-epoch"/>
-      </bedheights>
+      <dc:macro-body/>
     </dc:macro>
 
     <dc:macro name="bed-heights-single">