changeset 2582:631dabad9b48

Modified the datacage structure of 'floodmaps'. flys-artifacts/trunk@4132 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 08 Mar 2012 14:21:09 +0000
parents afebbe9c2fce
children 046d5c82ea0c
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml
diffstat 2 files changed, 80 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Thu Mar 08 13:44:51 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Mar 08 14:21:09 2012 +0000
@@ -1,3 +1,7 @@
+2012-03-08  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/conf/meta-data.xml: Modified the datacage structure of 'floodmaps'.
+
 2012-03-08  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java: New.
--- a/flys-artifacts/doc/conf/meta-data.xml	Thu Mar 08 13:44:51 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu Mar 08 14:21:09 2012 +0000
@@ -705,76 +705,84 @@
                 <uesk>
                   <calculations>
                     <current>
-                      <dc:context>
-                        <dc:statement>
-                            SELECT count(*) as uesg_exist, name as name
-                            FROM floodmaps
-                            WHERE river_id = ${river_id} AND kind = 111
-                            GROUP BY name, kind
-                        </dc:statement>
-                        <dc:elements>
-                          <dc:if test="$uesg_exist>0">
-                            <bfg>
-                              <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
-                              <dc:attribute name="ids" value="${river_id}_${name}"/>
-                              <dc:attribute name="name" value="${name}"/>
-                            </bfg>
-                          </dc:if>
-                        </dc:elements>
-                      </dc:context>
-                      <dc:context>
-                        <dc:statement>
-                            SELECT count(*) as uesg_exist, name as name
-                            FROM floodmaps
-                            WHERE river_id = ${river_id} AND kind = 112
-                            GROUP BY name, kind
-                        </dc:statement>
-                        <dc:elements>
-                          <dc:if test="$uesg_exist>0">
-                            <land>
-                              <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
-                              <dc:attribute name="ids" value="${river_id}_${name}"/>
-                              <dc:attribute name="name" value="${name}"/>
-                            </land>
-                          </dc:if>
-                        </dc:elements>
-                      </dc:context>
+                      <bfg>
+                        <dc:context>
+                          <dc:statement>
+                              SELECT count(*) as uesg_exist, name as name
+                              FROM floodmaps
+                              WHERE river_id = ${river_id} AND kind = 111
+                              GROUP BY name, kind
+                          </dc:statement>
+                          <dc:elements>
+                            <dc:if test="$uesg_exist>0">
+                              <floodmaps>
+                                <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
+                                <dc:attribute name="ids" value="${river_id}_${name}"/>
+                                <dc:attribute name="name" value="${name}"/>
+                              </floodmaps>
+                            </dc:if>
+                          </dc:elements>
+                        </dc:context>
+                      </bfg>
+                      <land>
+                        <dc:context>
+                          <dc:statement>
+                              SELECT count(*) as uesg_exist, name as name
+                              FROM floodmaps
+                              WHERE river_id = ${river_id} AND kind = 112
+                              GROUP BY name, kind
+                          </dc:statement>
+                          <dc:elements>
+                            <dc:if test="$uesg_exist>0">
+                              <floodmaps>
+                                <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
+                                <dc:attribute name="ids" value="${river_id}_${name}"/>
+                                <dc:attribute name="name" value="${name}"/>
+                              </floodmaps>
+                            </dc:if>
+                          </dc:elements>
+                        </dc:context>
+                      </land>
                     </current>
                     <potentiel>
-                      <dc:context>
-                        <dc:statement>
-                            SELECT count(*) as uesg_exist, name as name
-                            FROM floodmaps
-                            WHERE river_id = ${river_id} AND kind = 121
-                            GROUP BY name, kind
-                        </dc:statement>
-                        <dc:elements>
-                          <dc:if test="$uesg_exist>0">
-                            <bfg>
-                              <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
-                              <dc:attribute name="ids" value="${river_id}_${name}"/>
-                              <dc:attribute name="name" value="${name}"/>
-                            </bfg>
-                          </dc:if>
-                        </dc:elements>
-                      </dc:context>
-                      <dc:context>
-                        <dc:statement>
-                            SELECT count(*) as uesg_exist, name as name
-                            FROM floodmaps
-                            WHERE river_id = ${river_id} AND kind = 122
-                            GROUP BY name, kind
-                        </dc:statement>
-                        <dc:elements>
-                          <dc:if test="$uesg_exist>0">
-                            <land>
-                              <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
-                              <dc:attribute name="ids" value="${river_id}_${name}"/>
-                              <dc:attribute name="name" value="${name}"/>
-                            </land>
-                          </dc:if>
-                        </dc:elements>
-                      </dc:context>
+                      <bfg>
+                        <dc:context>
+                          <dc:statement>
+                              SELECT count(*) as uesg_exist, name as name
+                              FROM floodmaps
+                              WHERE river_id = ${river_id} AND kind = 121
+                              GROUP BY name, kind
+                          </dc:statement>
+                          <dc:elements>
+                            <dc:if test="$uesg_exist>0">
+                              <floodmaps>
+                                <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
+                                <dc:attribute name="ids" value="${river_id}_${name}"/>
+                                <dc:attribute name="name" value="${name}"/>
+                              </floodmaps>
+                            </dc:if>
+                          </dc:elements>
+                        </dc:context>
+                      </bfg>
+                      <land>
+                        <dc:context>
+                          <dc:statement>
+                              SELECT count(*) as uesg_exist, name as name
+                              FROM floodmaps
+                              WHERE river_id = ${river_id} AND kind = 122
+                              GROUP BY name, kind
+                          </dc:statement>
+                          <dc:elements>
+                            <dc:if test="$uesg_exist>0">
+                              <floodmaps>
+                                <dc:attribute name="factory" value="wmsfloodmapsfactory"/>
+                                <dc:attribute name="ids" value="${river_id}_${name}"/>
+                                <dc:attribute name="name" value="${name}"/>
+                              </floodmaps>
+                            </dc:if>
+                          </dc:elements>
+                        </dc:context>
+                      </land>
                     </potentiel>
                   </calculations>
                 </uesk>

http://dive4elements.wald.intevation.org