diff backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java @ 7918:5813c206ff64

Removed bed height epoch in importer.
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 06 Jun 2014 16:47:48 +0200
parents 8036688f24e1
children c915e99d9e52
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java	Thu Jun 05 15:32:52 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java	Fri Jun 06 16:47:48 2014 +0200
@@ -14,7 +14,6 @@
 
 import org.dive4elements.river.importer.parsers.AnnotationClassifier;
 import org.dive4elements.river.importer.parsers.AnnotationsParser;
-import org.dive4elements.river.importer.parsers.BedHeightEpochParser;
 import org.dive4elements.river.importer.parsers.BedHeightSingleParser;
 import org.dive4elements.river.importer.parsers.CrossSectionParser;
 import org.dive4elements.river.importer.parsers.DA50Parser;
@@ -93,8 +92,6 @@
 
     public static final String BED_HEIGHT_SINGLE_DIR = "Einzeljahre";
 
-    public static final String BED_HEIGHT_EPOCH_DIR = "Epochen";
-
     public static final String SEDIMENT_DENSITY_DIR = "Sedimentdichte";
 
     public static final String POROSITY_DIR = "Porositaet";
@@ -450,7 +447,6 @@
         File minfoDir     = getMinfoDir();
         File bedHeightDir = new File(minfoDir, BED_HEIGHT_DIR);
         File singlesDir   = new File(bedHeightDir, BED_HEIGHT_SINGLE_DIR);
-        File epochDir     = new File(bedHeightDir, BED_HEIGHT_EPOCH_DIR);
 
         if (Config.INSTANCE.skipBedHeightSingle()) {
             log.info("skip parsing bed height single.");
@@ -459,14 +455,6 @@
             log.info("Parse bed height single.");
             parseBedHeightSingles(singlesDir);
         }
-
-        if (Config.INSTANCE.skipBedHeightEpoch()) {
-            log.info("skip parsing bed height epochs.");
-        }
-        else {
-            log.info("Parse bed height epochs.");
-            parseBedHeightEpochs(epochDir);
-        }
     }
 
 
@@ -815,27 +803,6 @@
         bedHeightSingles = parser.getBedHeights();
     }
 
-
-    protected void parseBedHeightEpochs(File dir) throws IOException {
-        log.debug("Parse bed height epochs");
-
-        File[] files = dir.listFiles();
-
-        if (files == null) {
-            log.warn("Cannot read directory '" + dir + "'");
-            return;
-        }
-
-        BedHeightEpochParser parser = new BedHeightEpochParser();
-
-        for (File file: files) {
-            parser.parse(file);
-        }
-
-        bedHeightEpochs = parser.getBedHeights();
-    }
-
-
     public void parseFloodWater() throws IOException {
         if (Config.INSTANCE.skipFloodWater()) {
             log.info("skip parsing flod water");
@@ -1444,11 +1411,6 @@
             log.info("store bed heights single");
             storeBedHeightSingle();
         }
-
-        if (!Config.INSTANCE.skipBedHeightEpoch()) {
-            log.info("store bed height epoch.");
-            storeBedHeightEpoch();
-        }
     }
 
 
@@ -1472,25 +1434,6 @@
     }
 
 
-    private void storeBedHeightEpoch() {
-        River river = getPeer();
-
-        if (bedHeightEpochs != null) {
-            for (ImportBedHeight tmp: bedHeightEpochs) {
-                ImportBedHeightEpoch epoch = (ImportBedHeightEpoch) tmp;
-
-                String desc = epoch.getDescription();
-
-                log.debug("name: " + desc);
-
-                epoch.storeDependencies(river);
-            }
-        }
-        else {
-            log.info("No epoch bed heights to store.");
-        }
-    }
-
     public void storeSedimentDensity() {
         if (!Config.INSTANCE.skipSedimentDensity()) {
             log.info("store sediment density");

http://dive4elements.wald.intevation.org