# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1311007407 0
# Node ID ca7d461a53f1141d321fe35162c04673703183bf
# Parent  268f8da412e38dbbfabe893c539a6e05c7c87947
HYK importer: Various small fixes and some extra logging.

flys-backend/trunk@2355 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 268f8da412e3 -r ca7d461a53f1 flys-backend/ChangeLog
--- a/flys-backend/ChangeLog	Mon Jul 18 15:52:42 2011 +0000
+++ b/flys-backend/ChangeLog	Mon Jul 18 16:43:27 2011 +0000
@@ -1,3 +1,12 @@
+2011-07-18	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/model/HYK.java
+	  src/main/java/de/intevation/flys/importer/parsers/HYKParser.java,
+	  src/main/java/de/intevation/flys/importer/ImportHYKFormation.java,
+	  src/main/java/de/intevation/flys/importer/ImportHYKEntry.java,
+	  src/main/java/de/intevation/flys/importer/ImportHYK.java:
+	  Various small fixes and some extra logging.
+
 2011-07-18	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/importer/Config.java: New.
diff -r 268f8da412e3 -r ca7d461a53f1 flys-backend/src/main/java/de/intevation/flys/importer/ImportHYK.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYK.java	Mon Jul 18 15:52:42 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYK.java	Mon Jul 18 16:43:27 2011 +0000
@@ -9,8 +9,12 @@
 import org.hibernate.Session;
 import org.hibernate.Query;
 
+import org.apache.log4j.Logger;
+
 public class ImportHYK
 {
+    private static Logger log = Logger.getLogger(ImportHYK.class);
+
     protected ImportRiver river;
     protected String      description;
 
@@ -42,8 +46,12 @@
     }
 
     public void storeDependencies() {
+        log.info("store HYK '" + description + "'");
         getPeer();
-        for (ImportHYKEntry entry: entries) {
+        for (int i = 0, N = entries.size(); i < N; ++i) {
+            ImportHYKEntry entry = entries.get(i);
+            log.info("  store km " + entry.getKm() +
+                " (" + (i+1) + " of " + N + ")");
             entry.storeDependencies();
         }
     }
diff -r 268f8da412e3 -r ca7d461a53f1 flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKEntry.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKEntry.java	Mon Jul 18 15:52:42 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKEntry.java	Mon Jul 18 16:43:27 2011 +0000
@@ -31,6 +31,7 @@
         BigDecimal km,
         Date       measure
     ) {
+        this();
         this.hyk     = hyk;
         this.km      = km;
         this.measure = measure;
@@ -44,6 +45,14 @@
         this.hyk = hyk;
     }
 
+    public BigDecimal getKm() {
+        return km;
+    }
+
+    public void setKm(BigDecimal km) {
+        this.km = km;
+    }
+
     public void addFormation(ImportHYKFormation formation) {
         int numFormation = formations.size();
         formations.add(formation);
@@ -64,7 +73,7 @@
             Session session = ImporterSession.getInstance()
                 .getDatabaseSession();
             Query query = session.createQuery(
-                "from HYKEntry where hyk=:hyk " +
+                "from HYKEntry where HYK=:hyk " +
                 "and km=:km and measure=:measure");
             query.setParameter("hyk", h);
             query.setParameter("km", km);
diff -r 268f8da412e3 -r ca7d461a53f1 flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKFormation.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKFormation.java	Mon Jul 18 15:52:42 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKFormation.java	Mon Jul 18 16:43:27 2011 +0000
@@ -69,6 +69,22 @@
         this.entry = entry;
     }
 
+    public BigDecimal getTop() {
+        return top;
+    }
+
+    public void setTop(BigDecimal top) {
+        this.top = top;
+    }
+
+    public BigDecimal getBottom() {
+        return bottom;
+    }
+
+    public void setBottom(BigDecimal bottom) {
+        this.bottom = bottom;
+    }
+
     public BigDecimal getDistanceVL() {
         return distanceVL;
     }
diff -r 268f8da412e3 -r ca7d461a53f1 flys-backend/src/main/java/de/intevation/flys/importer/parsers/HYKParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/HYKParser.java	Mon Jul 18 15:52:42 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/HYKParser.java	Mon Jul 18 16:43:27 2011 +0000
@@ -179,7 +179,9 @@
                             return false;
                         }
                         formation = new ImportHYKFormation();
-                        formation.setEntry(entry);
+                        formation.setBottom(bottom);
+                        formation.setTop(top);
+                        entry.addFormation(formation);
 
                         state = State.LINE_3;
                         break;
@@ -255,7 +257,7 @@
                         try {
                             distanceVL = new BigDecimal(parts[0]);
                             distanceHF = new BigDecimal(parts[1]);
-                            distanceVL = new BigDecimal(parts[2]);
+                            distanceVR = new BigDecimal(parts[2]);
                         }
                         catch (NumberFormatException nfe) {
                             log.error("cannot parse number in line " +
diff -r 268f8da412e3 -r ca7d461a53f1 flys-backend/src/main/java/de/intevation/flys/model/HYK.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/HYK.java	Mon Jul 18 15:52:42 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HYK.java	Mon Jul 18 16:43:27 2011 +0000
@@ -62,7 +62,7 @@
         this.river = river;
     }
 
-    @Column(name = "name")
+    @Column(name = "description")
     public String getDescription() {
         return description;
     }