Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java @ 8412:17db08570637
SCHEMA CHANGE: removed superfluous columns station and river_id from measurement_stations and adapted other components accordingly.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 15 Oct 2014 19:20:26 +0200 |
| parents | cdb9f6d97f6a |
| children | 5e38e2924c07 |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java Wed Oct 15 14:58:46 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportMeasurementStation.java Wed Oct 15 19:20:26 2014 +0200 @@ -28,14 +28,13 @@ private MeasurementStation peer; public String name; - public Double station; public ImportRange range; public String measurementType; public String riverside; public String gauge; public ImportTimeInterval observationTimerange; public String operator; - public String description; + public String comment; public ImportMeasurementStation() { } @@ -71,7 +70,7 @@ } } catch (Exception e) { - log.error("Exception: " + e.getMessage()); + log.error(e.getMessage()); } Range range = null; @@ -97,12 +96,10 @@ org.hibernate.Query query = session .createQuery( "FROM MeasurementStation " + - "WHERE river=:river" + - " AND station=:station " + + "WHERE range=:range " + " AND measurement_type=:measurement_type "); - query.setParameter("river", river); - query.setParameter("station", station); + query.setParameter("range", range); query.setParameter("measurement_type", measurementType); List<MeasurementStation> stations = query.list(); @@ -110,9 +107,9 @@ if (stations.isEmpty()) { log.info("create new measurement station '" + name + "'"); - peer = new MeasurementStation(river, name, measurementType, - riverside, station, range, gauge, this.gauge, - observationTimerange, operator, description); + peer = new MeasurementStation(name, measurementType, + riverside, range, gauge, this.gauge, + observationTimerange, operator, comment); session.save(peer); }