[Dive4elements-commits] [PATCH 2 of 2] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1364412087 -3600
# Node ID a5bb0a139f1908760736707793664965022fc45b
# Parent  9d11717538ec469c22634e5dff9e80379a58fd7b
# Parent  5187911f5d45fd3d225b283bc719244784ae4064
merge

diff -r 9d11717538ec -r a5bb0a139f19 flys-aft/src/main/java/de/intevation/aft/River.java
--- a/flys-aft/src/main/java/de/intevation/aft/River.java	Wed Mar 27 20:21:01 2013 +0100
+++ b/flys-aft/src/main/java/de/intevation/aft/River.java	Wed Mar 27 20:21:27 2013 +0100
@@ -196,7 +196,7 @@
         int flysId;
 
         try {
-            if (rs.next()) {
+            if (!rs.next()) {
                 log.error(
                     "FLYS: No master discharge table found for gauge '" +
                     gauge.getAftName() + "'");
diff -r 9d11717538ec -r a5bb0a139f19 flys-aft/src/main/java/de/intevation/db/SymbolicStatement.java
--- a/flys-aft/src/main/java/de/intevation/db/SymbolicStatement.java	Wed Mar 27 20:21:01 2013 +0100
+++ b/flys-aft/src/main/java/de/intevation/db/SymbolicStatement.java	Wed Mar 27 20:21:27 2013 +0100
@@ -143,14 +143,23 @@
         }
 
         public boolean execute() throws SQLException {
+            if (log.isDebugEnabled()) {
+                log.debug("execute: " + compiled);
+            }
             return stmnt.execute();
         }
 
         public ResultSet executeQuery() throws SQLException {
+            if (log.isDebugEnabled()) {
+                log.debug("query: " + compiled);
+            }
             return stmnt.executeQuery();
         }
 
         public int executeUpdate() throws SQLException {
+            if (log.isDebugEnabled()) {
+                log.debug("update: " + compiled);
+            }
             return stmnt.executeUpdate();
         }
 
diff -r 9d11717538ec -r a5bb0a139f19 flys-aft/src/main/resources/sql/aft-common.properties
--- a/flys-aft/src/main/resources/sql/aft-common.properties	Wed Mar 27 20:21:01 2013 +0100
+++ b/flys-aft/src/main/resources/sql/aft-common.properties	Wed Mar 27 20:21:27 2013 +0100
@@ -17,9 +17,9 @@
     SELECT TAFELWERT_NR AS id, WASSERSTAND AS w, ABFLUSS AS q FROM TAFELWERT \
     WHERE ABFLUSSTAFEL_NR = :number
 select.bfg.id.current = \
-    SELECT BFG_ID AS BFG_ID FROM ABFLUSSTAFEL \
+    SELECT ABT.BFG_ID AS BFG_ID FROM ABFLUSSTAFEL ABT \
     WHERE GUELTIG_VON IN ( \
         SELECT min(GUELTIG_VON) FROM ABFLUSSTAFEL \
         WHERE GUELTIG_VON IS NOT NULL AND GUELTIG_BIS IS NULL \
         AND MESSSTELLE_NR LIKE :number) \
-    AND MESSSTELLE_NR :number
+    AND MESSSTELLE_NR LIKE :number
diff -r 9d11717538ec -r a5bb0a139f19 flys-aft/src/main/resources/sql/aft-oracle-jdbc-oracledriver.properties
--- a/flys-aft/src/main/resources/sql/aft-oracle-jdbc-oracledriver.properties	Wed Mar 27 20:21:01 2013 +0100
+++ b/flys-aft/src/main/resources/sql/aft-oracle-jdbc-oracledriver.properties	Wed Mar 27 20:21:27 2013 +0100
@@ -4,6 +4,6 @@
            GUELTIG_VON, \
            GUELTIG_BIS, \
            PEGELNULLPUNKT, \
-           BFG_ID \
-    FROM ABFLUSSTAFEL \
+           AT.BFG_ID \
+    FROM ABFLUSSTAFEL AT \
     WHERE MESSSTELLE_NR LIKE :number
diff -r 9d11717538ec -r a5bb0a139f19 flys-aft/src/main/resources/sql/flys-common.properties
--- a/flys-aft/src/main/resources/sql/flys-common.properties	Wed Mar 27 20:21:01 2013 +0100
+++ b/flys-aft/src/main/resources/sql/flys-common.properties	Wed Mar 27 20:21:27 2013 +0100
@@ -52,6 +52,6 @@
         dt.id AS id, \
         dt.bfg_id AS bfg_id \
     FROM discharge_tables dt JOIN gauges g ON dt.gauge_id = g.id \
-    WHERE g.id = :gauge_id AND g.kind = 0
+    WHERE g.id = :gauge_id AND dt.kind = 0
 update.bfg.id.discharge.table = \
     UPDATE discharge_tables SET bfg_id = :bfg_id WHERE id = :id