--- 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);
             }