[PATCH] DC: Group bedheight diffs by both years

Wald Commits scm-commit at wald.intevation.org
Fri Jun 20 16:41:36 CEST 2014


# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1403275290 -7200
# Node ID 7f1143972f16b0678982dceb59dc8dfd03885fe0
# Parent  e98ebf6585adffdd0a85a382557f4732e8f889f2
DC: Group bedheight diffs by both years.

diff -r e98ebf6585ad -r 7f1143972f16 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Fri Jun 20 16:33:36 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Jun 20 16:41:30 2014 +0200
@@ -1778,27 +1778,7 @@
     </dc:macro>
 
     <dc:macro name="minfo-heights-diff-tree">
-      <dc:comment>TODO: We need to group for year1 and year2</dc:comment>
-      <dc:group expr="$b1year">
-        <dc:element name="${dc:group-key()}">
-          <dc:comment>TODO: Better structure</dc:comment>
-          <dc:for-each>
-            <dc:comment>A - B</dc:comment>
-            <height factory="bedheight"
-                    target_out="{$out}"
-                    ids="bedheight-single-{$b1id}-{$b2id}"
-                    description="{$b1desc} - {$b2desc}"/>
-          </dc:for-each>
-          <dc:for-each>
-            <dc:comment>B - A</dc:comment>
-            <height factory="bedheight"
-                    target_out="{$out}"
-                    ids="bedheight-single-{$b2id}-{$b1id}"
-                    description="{$b2desc} - {$b1desc}"/>
-          </dc:for-each>
-        </dc:element>
-      </dc:group>
-      <dc:group expr="$b2year">
+      <dc:group expr="$b1year #!# $b2year">
         <dc:element name="${dc:group-key()}">
           <dc:comment>TODO: Better structure</dc:comment>
           <dc:for-each>


More information about the Dive4Elements-commits mailing list