[Dive4elements-commits] [PATCH] Added view for selecting ranges in wsts

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1354811409 -3600
# Node ID 83a42e6a562d657832d7fde64f6753844a146ddc
# Parent  31327b3b2455b42690b59a9a3b32e47f53777933
Added view for selecting ranges in wsts.

diff -r 31327b3b2455 -r 83a42e6a562d contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Thu Dec 06 13:10:27 2012 +0100
+++ b/contrib/make_flys_release/make_release.sh	Thu Dec 06 17:30:09 2012 +0100
@@ -88,22 +88,22 @@
 #rm $DIRECTORY/server/bin/lib/hibernate-spatial-postgis*
 
 echo "INFO: remove Oralce libraries"
-rm $DIRECTORY/server/bin/lib/hibernate-spatial-oracle-1.1.jar
-rm $DIRECTORY/server/bin/lib/ojdbc*
+rm -f $DIRECTORY/server/bin/lib/hibernate-spatial-oracle-1.1.jar
+rm -f $DIRECTORY/server/bin/lib/ojdbc*
 
 # fetch the configuration stuff
 echo "INFO: copy default configuration to target destination"
 cp -R $FLYS_HG/flys-artifacts/doc/conf $DIRECTORY/server/
 
 #cp confs/* $DIRECTORY/server/conf/
-mkdir -o $DIRECTORY/server/conf
+mkdir -p $DIRECTORY/server/conf
 
 sed "s/8999/$ARTIFACT_PORT/g" \
     confs/rest-server.xml \
     > $DIRECTORY/server/conf/rest-server.xml
 
-sed "s at http://czech-republic.intevation.de/@http://${MAPSERVER_URL}/@g" \
-    "s at flys-default@flys-$RELEASE at g" \
+sed -e "s at http://czech-republic.intevation.de/@http://${MAPSERVER_URL}/@g" \
+    -e "s at flys-default@flys-${RELEASE}@g" \
     confs/floodmap.xml \
     > $DIRECTORY/server/conf/floodmap.xml
 
diff -r 31327b3b2455 -r 83a42e6a562d flys-backend/doc/schema/oracle.sql
--- a/flys-backend/doc/schema/oracle.sql	Thu Dec 06 13:10:27 2012 +0100
+++ b/flys-backend/doc/schema/oracle.sql	Thu Dec 06 17:30:09 2012 +0100
@@ -473,3 +473,15 @@
          JOIN q_main_values qmv
            ON ol.river_id = qmv.river_id
               AND ol.name = qmv.name;
+
+CREATE VIEW wst_ranges
+AS
+  SELECT wc.id             AS wst_column_id,
+         wc.wst_id         AS wst_id,
+         Min(wcv.position) AS a,
+         Max(wcv.position) AS b
+  FROM   wst_columns wc
+         JOIN wst_column_values wcv
+           ON wc.id = wcv.wst_column_id
+  GROUP  BY wc.id,
+            wc.wst_id;
diff -r 31327b3b2455 -r 83a42e6a562d flys-backend/doc/schema/postgresql.sql
--- a/flys-backend/doc/schema/postgresql.sql	Thu Dec 06 13:10:27 2012 +0100
+++ b/flys-backend/doc/schema/postgresql.sql	Thu Dec 06 17:30:09 2012 +0100
@@ -413,4 +413,16 @@
            ON ol.river_id = qmv.river_id
               AND ol.name = qmv.name;
 
+CREATE VIEW wst_ranges
+AS
+  SELECT wc.id             AS wst_column_id,
+         wc.wst_id         AS wst_id,
+         Min(wcv.position) AS a,
+         Max(wcv.position) AS b
+  FROM   wst_columns wc
+         JOIN wst_column_values wcv
+           ON wc.id = wcv.wst_column_id
+  GROUP  BY wc.id,
+            wc.wst_id;
+
 COMMIT;
diff -r 31327b3b2455 -r 83a42e6a562d flys-client/pom.xml
--- a/flys-client/pom.xml	Thu Dec 06 13:10:27 2012 +0100
+++ b/flys-client/pom.xml	Thu Dec 06 17:30:09 2012 +0100
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.smartgwt</groupId>
       <artifactId>smartgwt</artifactId>
-      <version>3.0</version>
+      <version>3.1</version>
     </dependency>
     <dependency>
       <groupId>de.intevation.artifacts.common</groupId>
diff -r 31327b3b2455 -r 83a42e6a562d flys-client/src/main/java/de/intevation/flys/client/server/filter/GGInAFilter.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/filter/GGInAFilter.java	Thu Dec 06 13:10:27 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/filter/GGInAFilter.java	Thu Dec 06 17:30:09 2012 +0100
@@ -81,8 +81,10 @@
         HttpServletRequest sreq = (HttpServletRequest) req;
 
         String requesturi = sreq.getRequestURI();
-        for (Enumeration e = req.getAttributeNames() ; e.hasMoreElements() ;) {
-            logger.debug(e.nextElement());
+        if (logger.isDebugEnabled()) {
+            for (Enumeration e = req.getAttributeNames() ; e.hasMoreElements() ;) {
+                logger.debug(e.nextElement());
+            }
         }
 
         logger.debug("Request for: " + requesturi);
@@ -115,8 +117,10 @@
             redirect = true;
         }
 
-        if (sreq.getQueryString() != null) {
-            uri = uri + "?" + sreq.getQueryString();
+        String queryString = sreq.getQueryString();
+
+        if (queryString != null) {
+            uri += "?" + queryString;
         }
         session.setAttribute("requesturi", uri);