changeset 5796:53cff50918b1

Fix other buildings. Previously there was one level to many so that for each building a new folder was created
author Andre Heinecke <aheinecke@intevation.de>
date Tue, 23 Apr 2013 18:47:57 +0200 (2013-04-23)
parents 202a73ce6704
children cce12c06466f
files flys-artifacts/doc/conf/meta-data.xml
diffstat 1 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/meta-data.xml	Tue Apr 23 17:30:20 2013 +0200
+++ b/flys-artifacts/doc/conf/meta-data.xml	Tue Apr 23 18:47:57 2013 +0200
@@ -1581,24 +1581,23 @@
             <dc:context>
               <dc:statement>
                 SELECT DISTINCT
-                b.kind_id AS building_kind_id,
                 b.name AS building_name,
-                bk.name AS building_kind
+                bk.name AS building_kind,
+                b.kind_id AS building_kind_id
                 FROM buildings b
                 JOIN building_kinds bk ON b.kind_id = bk.id
                 WHERE river_id = ${river_id}
-                AND kind_id = 0 OR
-                kind_id IS NULL
+                AND kind_id = 0
               </dc:statement>
-              <dc:for-each>
-                <dc:element name="${building_kind}">
+              <dc:if test="dc:has-result()">
+                <other>
                   <dc:for-each>
                     <buildings description="{$building_name}"
-                               factory="wmsbuildingsfactory"
-                               ids="{$river_id};{$building_name}"/>
+                      factory="wmsbuildingsfactory"
+                      ids="{$river_id};{$building_name}"/>
                   </dc:for-each>
-                </dc:element>
-              </dc:for-each>
+                </other>
+              </dc:if>
             </dc:context>
             <dc:context>
               <dc:statement>

http://dive4elements.wald.intevation.org