Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java @ 311:ea3a438a7021
Backend access: Static methods are using the SessionHolder, too.
flys-artifacts/trunk@1694 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 14 Apr 2011 13:15:16 +0000 |
parents | 03362976fa0f |
children | 94c176fdcb89 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java Thu Apr 14 13:11:12 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java Thu Apr 14 13:15:16 2011 +0000 @@ -7,14 +7,11 @@ import java.io.Serializable; -import org.hibernate.SessionFactory; import org.hibernate.Session; import org.hibernate.Query; import org.apache.log4j.Logger; -import de.intevation.flys.backend.SessionFactoryProvider; - import de.intevation.flys.model.Gauge; import de.intevation.flys.model.DischargeTable; import de.intevation.flys.model.DischargeTableValue; @@ -56,55 +53,49 @@ protected Map<String, double [][]> loadValues(double scale) { Map<String, double [][]> values = new HashMap<String, double [][]>(); - SessionFactory sf = SessionFactoryProvider.getSessionFactory(); - Session session = sf.openSession(); - - try { - Query gaugeQuery = session.createQuery( - "from Gauge where name=:gauge and river.name=:river"); - gaugeQuery.setParameter("river", riverName); - - for (String gaugeName: gaugeNames) { - gaugeQuery.setParameter("gauge", gaugeName); - List<Gauge> gauges = gaugeQuery.list(); - if (gauges.isEmpty()) { - log.warn( - "no gauge '"+gaugeName+"' at river '"+riverName+"'"); - continue; - } - Gauge gauge = gauges.get(0); - - List<DischargeTable> tables = gauge.getDischargeTables(); + Session session = SessionHolder.HOLDER.get(); - if (tables.isEmpty()) { - log.warn( - "no discharge table for gauge '" + gaugeName + "'"); - continue; - } - - // TODO: Filter by time interval - DischargeTable table = tables.get(0); + Query gaugeQuery = session.createQuery( + "from Gauge where name=:gauge and river.name=:river"); + gaugeQuery.setParameter("river", riverName); - List<DischargeTableValue> dtvs = - table.getDischargeTableValues(); - - double [][] vs = new double[2][dtvs.size()]; + for (String gaugeName: gaugeNames) { + gaugeQuery.setParameter("gauge", gaugeName); + List<Gauge> gauges = gaugeQuery.list(); + if (gauges.isEmpty()) { + log.warn( + "no gauge '"+gaugeName+"' at river '"+riverName+"'"); + continue; + } + Gauge gauge = gauges.get(0); - int idx = 0; - for (DischargeTableValue dtv: dtvs) { - vs[0][idx] = dtv.getQ().doubleValue() * scale; - vs[1][idx] = dtv.getW().doubleValue() * scale; - ++idx; - } + List<DischargeTable> tables = gauge.getDischargeTables(); - values.put(gaugeName, vs); + if (tables.isEmpty()) { + log.warn( + "no discharge table for gauge '" + gaugeName + "'"); + continue; } - return values; + // TODO: Filter by time interval + DischargeTable table = tables.get(0); + + List<DischargeTableValue> dtvs = + table.getDischargeTableValues(); + + double [][] vs = new double[2][dtvs.size()]; + + int idx = 0; + for (DischargeTableValue dtv: dtvs) { + vs[0][idx] = dtv.getQ().doubleValue() * scale; + vs[1][idx] = dtv.getW().doubleValue() * scale; + ++idx; + } + + values.put(gaugeName, vs); } - finally { - session.close(); - } + + return values; } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :