Mercurial > dive4elements > river
diff flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeZone.java @ 2833:5b54a648f702
Finished flow velocity data import: finished parsing meta data of model files and repaired broken HQL statements.
flys-backend/trunk@4259 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 18 Apr 2012 08:54:55 +0000 |
parents | 85b25e74594f |
children | 8649e4ed01ec |
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeZone.java Tue Apr 17 13:00:04 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeZone.java Wed Apr 18 08:54:55 2012 +0000 @@ -23,25 +23,24 @@ private String gaugeName; - private ImportNamedMainValue mainValue; + private BigDecimal value; - private BigDecimal lowerFactor; - - private BigDecimal upperFactor; + private String lowerDischarge; + private String upperDischarge; private DischargeZone peer; public ImportDischargeZone( - ImportNamedMainValue mainValue, - String gaugeName, - BigDecimal lowerFactor, - BigDecimal upperFactor + String gaugeName, + BigDecimal value, + String lowerDischarge, + String upperDischarge ) { - this.mainValue = mainValue; - this.gaugeName = gaugeName; - this.lowerFactor = lowerFactor; - this.upperFactor = upperFactor; + this.gaugeName = gaugeName; + this.value = value; + this.lowerDischarge = lowerDischarge; + this.upperDischarge = upperDischarge; } @@ -50,8 +49,6 @@ { log.debug("store dependencies"); - mainValue.getPeer(); - getPeer(river); } @@ -60,28 +57,26 @@ if (peer == null) { Session session = ImporterSession.getInstance().getDatabaseSession(); - NamedMainValue namedMainValue = mainValue.getPeer(); - Query query = session.createQuery( "from DischargeZone where " + - " river:=river and " + + " river=:river and " + " gaugeName=:gaugeName and " + - " mainValue=:mainValue" + " value=:value" ); query.setParameter("river", river); query.setParameter("gaugeName", gaugeName); - query.setParameter("mainValue", namedMainValue); + query.setParameter("value", value); List<DischargeZone> zone = query.list(); if (zone.isEmpty()) { peer = new DischargeZone( - gaugeName, river, - namedMainValue, - lowerFactor, - upperFactor); + gaugeName, + value, + lowerDischarge, + upperDischarge); session.save(peer); }