diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java @ 7919:868f55932fe6

Removed serverside path for bed height epochs.
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 06 Jun 2014 16:59:16 +0200
parents 1aba75321441
children b5cba2690347
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java	Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java	Fri Jun 06 16:59:16 2014 +0200
@@ -40,26 +40,11 @@
         "       ORDER BY bhsv.station";
 
 
-    /** Query to get name for wst_id and column_pos. */
-    public static final String SQL_SELECT_EPOCH =
-        "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" +
-        "       ORDER BY bhsv.station";
-
     /** Query to get name (description) for wst_id. */
     public static final String SQL_SELECT_DESCR_SINGLE =
         "SELECT description FROM bed_height_single "+
         "WHERE id = :height_id";
 
-    /** Query to get name (description) for wst_id. */
-    public static final String SQL_SELECT_DESCR_EPOCH =
-        "SELECT description from bed_height_epoch "+
-        "WHERE id = :height_id";
-
-
     private BedHeightFactory() {
     }
 
@@ -108,11 +93,6 @@
                 .addScalar("description", StandardBasicTypes.STRING);
             nameQuery.setInteger("height_id", height_id);
         }
-        else if (type.equals("epoch")) {
-            nameQuery = session.createSQLQuery(SQL_SELECT_DESCR_EPOCH)
-                .addScalar("description", StandardBasicTypes.STRING);
-            nameQuery.setInteger("height_id", height_id);
-        }
         else {
             return "none";
         }
@@ -165,26 +145,6 @@
             }
             return height;
         }
-        else if (type.equals("epoch")) {
-            BedHeightEpochData height =
-                new BedHeightEpochData(getHeightName(type, height_id));
-            sqlQuery = session.createSQLQuery(SQL_SELECT_EPOCH)
-                .addScalar("height", StandardBasicTypes.DOUBLE)
-                .addScalar("station", StandardBasicTypes.DOUBLE)
-                .addScalar("start_time", StandardBasicTypes.DATE)
-                .addScalar("stop_time", StandardBasicTypes.DATE);
-            sqlQuery.setInteger("height_id", height_id);
-            List<Object []> results = sqlQuery.list();
-
-            for (Object [] row: results) {
-                height.add(
-                    (Double) row[0],
-                    (Double) row[1],
-                    (Date)   row[2],
-                    (Date)   row[3]);
-            }
-            return height;
-        }
         return new BedHeightData();
     }
 }

http://dive4elements.wald.intevation.org