[PATCH] Select complete differences matrix to have a well sorted dc-tree
Wald Commits
scm-commit at wald.intevation.org
Fri Jun 27 15:10:16 CEST 2014
# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1403874610 -7200
# Node ID 5dc5bbfdc02322718baa91e97b63422c44adde2e
# Parent 5eb8cd9201d8fc02344fb6f04d7834d9d8de9e38
Select complete differences matrix to have a well sorted dc-tree.
diff -r 5eb8cd9201d8 -r 5dc5bbfdc023 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Fri Jun 27 13:05:34 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml Fri Jun 27 15:10:10 2014 +0200
@@ -1745,7 +1745,7 @@
FROM sta b1
JOIN sta b2
ON b1.station = b2.station
- AND b1.id < b2.id)
+ AND b1.id <> b2.id)
SELECT DISTINCT b1id, b1desc, b1year,
b2id, b2desc, b2year
FROM csta
@@ -1778,7 +1778,7 @@
</dc:macro>
<dc:macro name="minfo-heights-diff-tree">
- <dc:group expr="dc:coalesce($b1year, 'sonstige') #!# dc:coalesce($b2year, 'sonstige')">
+ <dc:group expr="dc:coalesce($b1year, 'sonstige')">
<minfo-diff name="{dc:group-key()}">
<dc:for-each>
<dc:choose>
@@ -1801,13 +1801,13 @@
info="{$b2desc}#{$b1desc}"
description="{$b2desc} - {$b1desc}"/>
</dc:when>
- <dc:otherwise>
+ <!--dc:otherwise>
<height factory="bedheight"
target_out="{$out}"
ids="bedheight-single-{$b2id}-{$b2year}#bedheight-single-{$b1id}-{$b1year}"
info="{$b2desc}#{$b1desc}"
description="{$b2desc} - {$b1desc}"/>
- </dc:otherwise>
+ </dc:otherwise-->
</dc:choose>
</dc:for-each>
</minfo-diff>
More information about the Dive4Elements-commits
mailing list