Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/model/River.java @ 9533:d9fda7af24ca
No discharge zone calculation and output for gauges unknown in flys for sinfo collision (Meilenstein 2, 2.2.1)
| author | mschaefer |
|---|---|
| date | Thu, 04 Oct 2018 12:48:57 +0200 |
| parents | 7c8d62867876 |
| children |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/model/River.java Tue Oct 02 18:19:44 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/model/River.java Thu Oct 04 12:48:57 2018 +0200 @@ -254,9 +254,9 @@ public Gauge determineGaugeByName(final String name) { final Session session = SessionHolder.HOLDER.get(); final Query query = session.createQuery( - "from Gauge where river=:river and name=:name"); + "from Gauge where river=:river and lower(name)=:name"); query.setParameter("river", this); - query.setParameter("name", name); + query.setParameter("name", name.toLowerCase()); final List<Gauge> gauges = query.list(); return gauges.isEmpty() ? null : gauges.get(0); } @@ -428,7 +428,7 @@ } return null; } - + public Gauge firstUpstreamGauge() { final List<Gauge> gauges = getGauges(); @@ -445,7 +445,7 @@ if (byKm.isEmpty()) return null; - if (kmUp) + if (this.kmUp) return byKm.lastEntry().getValue(); return byKm.firstEntry().getValue();