--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Tue Oct 04 06:47:00 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Tue Oct 04 15:28:19 2011 +0000
@@ -19,6 +19,7 @@
 import de.intevation.artifacts.common.utils.FileTools.HashedFile;
 
 import de.intevation.flys.model.River;
+import de.intevation.flys.model.Unit;
 
 import de.intevation.flys.importer.parsers.PRFParser;
 import de.intevation.flys.importer.parsers.HYKParser;
@@ -79,6 +80,8 @@
 
     protected ImportWst wst;
 
+    protected ImportUnit wstUnit;
+
     protected AnnotationClassifier annotationClassifier;
 
     protected River peer;
@@ -506,6 +509,7 @@
     }
 
     public void storeDependencies() {
+        storeWstUnit();
         storeAnnotations();
         storeHYKs();
         storeCrossSections();
@@ -518,6 +522,15 @@
         storeFloodProtection();
     }
 
+    public void storeWstUnit() {
+        if (wst == null) {
+            wstUnit = new ImportUnit("NN + m");
+        }
+        else {
+            wstUnit = wst.getUnit();
+        }
+    }
+
     public void storeHYKs() {
         if (!Config.INSTANCE.skipHYKs()) {
             log.info("store HYKs");
@@ -628,10 +641,14 @@
         if (peer == null) {
             Session session = ImporterSession.getInstance().getDatabaseSession();
             Query query = session.createQuery("from River where name=:name");
+
+            Unit u = wstUnit.getPeer();
+
             query.setString("name", name);
             List<River> rivers = query.list();
             if (rivers.isEmpty()) {
-                peer = new River(name);
+                log.info("Store new river '" + name + "'");
+                peer = new River(name, u);
                 session.save(peer);
             }
             else {