# HG changeset patch
# User Tom Gottfried <tom.gottfried@intevation.de>
# Date 1365789135 -7200
# Node ID b85df73edef0632fa477430269f56165272e1fc4
# Parent  a3f7da9bf0d1febccb4431c299c5b54f28ca464a# Parent  7b6cca32f94063229cf64c13e71cb40ff1ff2a48
merge

diff -r 7b6cca32f940 -r b85df73edef0 flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java	Fri Apr 12 19:18:02 2013 +0200
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportFlowVelocityModel.java	Fri Apr 12 19:52:15 2013 +0200
@@ -30,6 +30,12 @@
         values = new ArrayList<ImportFlowVelocityModelValue>();
     }
 
+    public ImportFlowVelocityModel(String description) {
+        this();
+
+        this.description = description;
+    }
+
     public ImportFlowVelocityModel(ImportDischargeZone dischargeZone,
         String description) {
         this();
@@ -84,14 +90,12 @@
             Query query = session.createQuery("from FlowVelocityModel where "
                 + "   dischargeZone=:dischargeZone");
 
-            //query.setParameter("river", river);
             query.setParameter("dischargeZone", zone);
 
             List<FlowVelocityModel> model = query.list();
 
             if (model.isEmpty()) {
-                //peer = new FlowVelocityModel(river, zone);
-                peer = new FlowVelocityModel(zone);
+                peer = new FlowVelocityModel(zone, description);
                 session.save(peer);
             }
             else {
diff -r 7b6cca32f940 -r b85df73edef0 flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java	Fri Apr 12 19:18:02 2013 +0200
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/FlowVelocityModelParser.java	Fri Apr 12 19:52:15 2013 +0200
@@ -1,5 +1,8 @@
 package de.intevation.flys.importer.parsers;
 
+import java.io.File;
+import java.io.IOException;
+
 import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.text.ParseException;
@@ -49,6 +52,8 @@
 
     private ImportFlowVelocityModel current;
 
+    protected String description;
+
 
     public FlowVelocityModelParser() {
         models = new ArrayList<ImportFlowVelocityModel>();
@@ -60,14 +65,23 @@
     }
 
     @Override
+    public void parse(File file) throws IOException {
+        description = file.getName();
+
+        super.parse(file);
+    }
+
+    @Override
     protected void reset() {
-        current = new ImportFlowVelocityModel();
+        current = new ImportFlowVelocityModel(description);
     }
 
 
     @Override
     protected void finish() {
         models.add(current);
+
+	//	description = null;
     }