--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFactory.java	Fri Sep 21 14:03:48 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedHeightFactory.java	Fri Sep 21 14:18:16 2012 +0000
@@ -22,16 +22,18 @@
 
     /** Query to get km and ws for wst_id and column_pos. */
     public static final String SQL_SELECT_SINGLE =
-        "SELECT height, station, data_gap, sounding_width, year " +
-        "   FROM bed_height_single_values " +
-        "   WHERE id = :height_id";
+        "SELECT bhsv.height, bhsv.station, bhsv.data_gap, bhsv.sounding_width, bhs.year " +
+        "   FROM bed_height_single bhs" +
+        "       JOIN bed_height_single_values bhsv on bhsv.bed_height_single_id = bhs.id" +
+        "   WHERE bhs.id = :height_id";
 
     /** Query to get name for wst_id and column_pos. */
     public static final String SQL_SELECT_EPOCH =
-        "SELECT b.height, b.station, ti.start_time, ti.stop_time" +
-        "   FROM bed_height_epoch_values b" +
-        "       JOIN time_interval ti ON b.time_interval_id = ti.id" +
-        "   WHERE id = :height_id";
+        "SELECT bv.height, bv.station, ti.start_time, ti.stop_time" +
+        "   FROM bed_height_epoch b" +
+        "       JOIN bed_height_epoch_values bv ON b.id = bv.bed_height_epoch_id" +
+        "       JOIN time_intervals ti ON b.time_interval_id = ti.id" +
+        "   WHERE b.id = :height_id";
 
     /** Query to get name (description) for wst_id. */
     public static final String SQL_SELECT_DESCR_SINGLE =
@@ -138,8 +140,9 @@
             sqlQuery.setInteger("height_id", height_id);
             List<Object []> results = sqlQuery.list();
 
-            for (int i = 0; i <= results.size(); i++) {
+            for (int i = 0; i < results.size(); i++) {
                 Object[] row = results.get(i);
+                log.debug("got station: " + (Double)row[1]);
                 height.add(
                     (Double) row[0],
                     (Double) row[1],
@@ -160,13 +163,11 @@
             sqlQuery.setInteger("height_id", height_id);
             List<Object []> results = sqlQuery.list();
 
-            for (int i = 0; i <= results.size(); i++) {
+            for (int i = 0; i < results.size(); i++) {
                 Object[] row = results.get(i);
                 height.add(
                     (Double) row[0],
                     (Double) row[1],
-                    0,
-                    0,
                     (Date) row[2],
                     (Date)row[3]);
             }