changeset 5080:b87e504f916e

Importer/River: Move storeOfficialNumber from parse* to store*, do not store explicitely.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 22 Feb 2013 15:50:06 +0100
parents 38581d6bfd6f
children 4f65d833680f 2b24073e80d9 f9e2e1c84263
files flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java flys-backend/src/main/java/de/intevation/flys/importer/Importer.java
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Fri Feb 22 15:41:34 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Fri Feb 22 15:50:06 2013 +0100
@@ -297,7 +297,6 @@
         parseWaterlevelDifferences();
         parseMeasurementStations();
         parseSQRelation();
-        storeOfficialNumber();
     }
 
     public void parseFloodProtection() throws IOException {
@@ -1083,6 +1082,7 @@
         storeWaterlevelDifferences();
         storeMeasurementStations();
         storeSQRelations();
+        storeOfficialNumber();
     }
 
     public void storeWstUnit() {
--- a/flys-backend/src/main/java/de/intevation/flys/importer/Importer.java	Fri Feb 22 15:41:34 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/Importer.java	Fri Feb 22 15:50:06 2013 +0100
@@ -175,7 +175,6 @@
                     for(Map.Entry<String, Long> entry: map.entrySet()) {
                         if (StringUtil.containsIgnoreCase(entry.getKey(), river.getName())) {
                             river.setOfficialNumber(entry.getValue());
-                            river.storeOfficialNumber();
                             log.debug(river.getName() + " is mapped to bwastr " + entry.getValue());
                         }
                     }

http://dive4elements.wald.intevation.org