diff backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java @ 8412:17db08570637

SCHEMA CHANGE: removed superfluous columns station and river_id from measurement_stations and adapted other components accordingly.
author Tom Gottfried <tom@intevation.de>
date Wed, 15 Oct 2014 19:20:26 +0200
parents 3ae11daff343
children 9db1f48bfea9
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java	Wed Oct 15 14:58:46 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java	Wed Oct 15 19:20:26 2014 +0200
@@ -19,6 +19,7 @@
 import org.dive4elements.river.importer.ImportSedimentLoad;
 import org.dive4elements.river.importer.ImportSedimentLoadValue;
 
+import org.dive4elements.river.model.River;
 import org.dive4elements.river.model.MeasurementStation;
 
 /** Parses sediment load longitudinal section files. */
@@ -39,15 +40,15 @@
 
     protected ImportSedimentLoad[] current;
 
-    protected String rivername;
+    protected River river;
 
     public SedimentLoadParser() {
         sedimentLoads = new ArrayList<ImportSedimentLoad>();
     }
 
-    public SedimentLoadParser(String rivername) {
+    public SedimentLoadParser(River river) {
         sedimentLoads = new ArrayList<ImportSedimentLoad>();
-        this.rivername = rivername;
+        this.river = river;
     }
 
 
@@ -116,7 +117,7 @@
 
             List<MeasurementStation> ms =
                 ImporterSession.getInstance().getMeasurementStations(
-                    rivername, km);
+                    river, km);
 
             String gfn = grainFraction.getPeer().getName();
 
@@ -145,12 +146,12 @@
                 }
                 log.error("SLP: No measurement station at km " + km +
                     " fitting grain fraction " + gfn +
-                    " on river " + rivername);
+                    " on river " + river.getName());
                 return;
             }
             else {
                 log.error("SLP: No measurement station at km " + km +
-                    " on river " + rivername);
+                    " on river " + river.getName());
                 return;
             }
         }

http://dive4elements.wald.intevation.org