Mercurial > dive4elements > river
changeset 6370:55a2f9e0d6ab double-precision
fix official lines import
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Tue, 18 Jun 2013 19:33:40 +0200 |
| parents | 7fb0e755e4fa |
| children | a81fbbda28e7 |
| files | backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java backend/src/main/java/org/dive4elements/river/model/OfficialLine.java |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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(
--- 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,