Mercurial > dive4elements > river
diff flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeTable.java @ 493:b35c5dc0f8b7
Importer: Make import of historical discharge tables work.
flys-backend/trunk@1842 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 06 May 2011 10:27:32 +0000 |
parents | 14de9246b356 |
children | 67fd63e4ef66 |
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeTable.java Thu May 05 15:25:16 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeTable.java Fri May 06 10:27:32 2011 +0000 @@ -10,26 +10,40 @@ import de.intevation.flys.model.Gauge; import de.intevation.flys.model.TimeInterval; +import org.apache.log4j.Logger; + public class ImportDischargeTable { protected DischargeTable peer; - protected Integer kind; + protected String description; + + protected Integer kind; protected List<ImportDischargeTableValue> dischargeTableValues; protected ImportTimeInterval timeInterval; public ImportDischargeTable() { - this(0); + this(0, null); } - public ImportDischargeTable(int kind) { - this.kind = kind; + public ImportDischargeTable(int kind, String description) { + this.kind = kind; + this.description = description; dischargeTableValues = new ArrayList<ImportDischargeTableValue>(); } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public void addDischargeTableValue(ImportDischargeTableValue value) { dischargeTableValues.add(value); } @@ -62,14 +76,16 @@ Query query = session.createQuery( "from DischargeTable where " + - "gauge.id=:gauge and kind=:kind and timeInterval=:interval"); - query.setParameter("gauge", gauge.getId()); - query.setParameter("kind", kind); - query.setParameter("interval", ti); + "gauge.id=:gauge and kind=:kind and " + + "description=:description and timeInterval=:interval"); + query.setParameter("gauge", gauge.getId()); + query.setParameter("description", description); + query.setParameter("kind", kind); + query.setParameter("interval", ti); List<DischargeTable> dischargeTables = query.list(); if (dischargeTables.isEmpty()) { - peer = new DischargeTable(gauge, kind); + peer = new DischargeTable(gauge, description, kind, ti); session.save(peer); } else {