Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/MeasurementFactory.java @ 8684:2e11fc7f5d35
(issue1796) Use seddb name of a river when accessing the seddb
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Mon, 13 Apr 2015 11:26:44 +0200 |
| parents | fe7e9da6312a |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 8683:cfafe5764509 | 8684:2e11fc7f5d35 |
|---|---|
| 30 import org.hibernate.type.StandardBasicTypes; | 30 import org.hibernate.type.StandardBasicTypes; |
| 31 | 31 |
| 32 import org.dive4elements.river.artifacts.model.DateRange; | 32 import org.dive4elements.river.artifacts.model.DateRange; |
| 33 | 33 |
| 34 import org.dive4elements.river.backend.SedDBSessionHolder; | 34 import org.dive4elements.river.backend.SedDBSessionHolder; |
| 35 import org.dive4elements.river.artifacts.model.RiverFactory; | |
| 35 | 36 |
| 36 import au.com.bytecode.opencsv.CSVWriter; | 37 import au.com.bytecode.opencsv.CSVWriter; |
| 37 | 38 |
| 38 public class MeasurementFactory | 39 public class MeasurementFactory |
| 39 { | 40 { |
| 256 double location, | 257 double location, |
| 257 DateRange dateRange, | 258 DateRange dateRange, |
| 258 SQ.Factory sqFactory | 259 SQ.Factory sqFactory |
| 259 ) { | 260 ) { |
| 260 Session session = SedDBSessionHolder.HOLDER.get(); | 261 Session session = SedDBSessionHolder.HOLDER.get(); |
| 262 String seddbRiver = RiverFactory.getRiver(river).nameForSeddb(); | |
| 263 | |
| 261 List<Measurement> totals = loadTotals( | 264 List<Measurement> totals = loadTotals( |
| 262 session, river, location, dateRange); | 265 session, seddbRiver, location, dateRange); |
| 263 | 266 |
| 264 List<Measurement> accumulated = loadFractions( | 267 List<Measurement> accumulated = loadFractions( |
| 265 session, river, location, dateRange); | 268 session, seddbRiver, location, dateRange); |
| 266 | 269 |
| 267 return new Measurements(totals, accumulated, sqFactory); | 270 return new Measurements(totals, accumulated, sqFactory); |
| 268 } | 271 } |
| 269 | 272 |
| 270 @SuppressWarnings("unchecked") | 273 @SuppressWarnings("unchecked") |