diff flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeTable.java @ 486:8ea09ec7f0c8

Importer: Attach a time interval to a discharge table if we find one during import. flys-backend/trunk@1813 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 03 May 2011 17:34:52 +0000
parents 70de916d3e3a
children 14de9246b356
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeTable.java	Tue May 03 17:09:38 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportDischargeTable.java	Tue May 03 17:34:52 2011 +0000
@@ -8,7 +8,7 @@
 
 import de.intevation.flys.model.DischargeTable;
 import de.intevation.flys.model.Gauge;
-
+import de.intevation.flys.model.TimeInterval;
 
 public class ImportDischargeTable
 {
@@ -18,6 +18,7 @@
 
     protected List<ImportDischargeTableValue> dischargeTableValues;
 
+    protected ImportTimeInterval timeInterval;
 
     public ImportDischargeTable() {
         kind = 0;
@@ -39,15 +40,28 @@
         return dischargeTableValues;
     }
 
+    public ImportTimeInterval getTimeInterval() {
+        return timeInterval;
+    }
+
+    public void setTimeInterval(ImportTimeInterval timeInterval) {
+        this.timeInterval = timeInterval;
+    }
+
 
     public DischargeTable getPeer(Gauge gauge) {
         if (peer == null) {
+            TimeInterval ti = timeInterval != null
+                ? timeInterval.getPeer()
+                : null;
             Session session = Importer.sessionHolder.get();
 
             Query query = session.createQuery(
-                "from DischargeTable where gauge.id=:gauge and kind=:kind");
-            query.setParameter("gauge", gauge.getId());
-            query.setParameter("kind", kind);
+                "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);
 
             List<DischargeTable> dischargeTables = query.list();
             if (dischargeTables.isEmpty()) {

http://dive4elements.wald.intevation.org