diff flys-backend/src/main/java/de/intevation/flys/importer/ImportWst.java @ 2347:0acf28a3d28a

Removed the Unit from Wsts - added a WstUnit column to rivers. flys-backend/trunk@2884 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 04 Oct 2011 15:28:19 +0000
parents f834b411ca57
children 3eb520b7a70e
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportWst.java	Tue Oct 04 06:47:00 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportWst.java	Tue Oct 04 15:28:19 2011 +0000
@@ -67,6 +67,10 @@
         return columns.get(index);
     }
 
+    public ImportUnit getUnit() {
+        return unit;
+    }
+
     public void setUnit(ImportUnit unit) {
         this.unit = unit;
     }
@@ -80,15 +84,12 @@
             column.storeDependencies(river);
         }
 
-        unit.storeDependencies(river);
-
         Session session = ImporterSession.getInstance().getDatabaseSession();
         session.flush();
     }
 
     public Wst getPeer(River river) {
         if (peer == null) {
-            Unit u = unit.getPeer(river);
             Session session = ImporterSession.getInstance().getDatabaseSession();
             Query query = session.createQuery(
                 "from Wst where " +
@@ -98,7 +99,7 @@
             query.setParameter("kind",        kind);
             List<Wst> wsts = query.list();
             if (wsts.isEmpty()) {
-                peer = new Wst(river, description, kind, u);
+                peer = new Wst(river, description, kind);
                 session.save(peer);
             }
             else {

http://dive4elements.wald.intevation.org