[Dive4elements-commits] [PATCH 2 of 2] fix official lines import

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1371576820 -7200
# Branch double-precision
# Node ID 55a2f9e0d6ab789a456ad0218204c33bdf65990f
# Parent  7fb0e755e4fa50a81d2b1623dd16137a7ed1edf5
fix official lines import

diff -r 7fb0e755e4fa -r 55a2f9e0d6ab backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java	Tue Jun 18 19:32:31 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java	Tue Jun 18 19:33:40 2013 +0200
@@ -97,7 +97,12 @@
 
         log.info("Parsing WST file '" + file + "'");
 
-        wst = new ImportWst(file.getName());
+	if (wst == null) {
+	    wst = new ImportWst(file.getName());
+	}
+	else {
+	    wst.setDescription(file.getName());
+	}
 
         LineNumberReader in =
             new LineNumberReader(
diff -r 7fb0e755e4fa -r 55a2f9e0d6ab backend/src/main/java/org/dive4elements/river/model/OfficialLine.java
--- a/backend/src/main/java/org/dive4elements/river/model/OfficialLine.java	Tue Jun 18 19:32:31 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/OfficialLine.java	Tue Jun 18 19:33:40 2013 +0200
@@ -41,7 +41,7 @@
     @Id
     @SequenceGenerator(
         name           = "SEQUENCE_OFFICIAL_LINES_ID_SEQ",
-        sequenceName   = "OFFICIAL_LINES_ID_SEQ_ID_SEQ",
+        sequenceName   = "OFFICIAL_LINES_ID_SEQ",
         allocationSize = 1)
     @GeneratedValue(
         strategy  = GenerationType.SEQUENCE,