--- a/backend/src/main/java/org/dive4elements/river/importer/Config.java	Tue Apr 03 10:02:01 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/Config.java	Tue Apr 03 10:18:30 2018 +0200
@@ -11,121 +11,163 @@
 public class Config
 {
     public static final String SKIP_DEFAULT =
-        "flys.backend.importer.skip.default";
+            "flys.backend.importer.skip.default";
 
     public static final String DRY_RUN =
-        "flys.backend.importer.dry.run";
+            "flys.backend.importer.dry.run";
 
     public static final String INFO_GEW_FILE =
-        "flys.backend.importer.infogew.file";
+            "flys.backend.importer.infogew.file";
 
     public static final String ANNOTATION_TYPES =
-        "flys.backend.importer.annotation.types";
+            "flys.backend.importer.annotation.types";
 
     public static final String SKIP_GAUGES =
-        "flys.backend.importer.skip.gauges";
+            "flys.backend.importer.skip.gauges";
 
     public static final String SKIP_BWASTR =
-        "flys.backend.importer.skip.bwastr";
+            "flys.backend.importer.skip.bwastr";
 
     public static final String SKIP_HISTORICAL_DISCHARGE_TABLES =
-        "flys.backend.importer.skip.historical.discharge.tables";
+            "flys.backend.importer.skip.historical.discharge.tables";
 
     public static final String SKIP_ANNOTATIONS =
-        "flys.backend.importer.skip.annotations";
+            "flys.backend.importer.skip.annotations";
 
     public static final String SKIP_PRFS =
-        "flys.backend.importer.skip.prfs";
+            "flys.backend.importer.skip.prfs";
 
     public static final String SKIP_DA50S =
-        "flys.backend.importer.skip.da50s";
+            "flys.backend.importer.skip.da50s";
 
     public static final String SKIP_W80S =
-        "flys.backend.importer.skip.w80s";
+            "flys.backend.importer.skip.w80s";
 
     public static final String SKIP_W80_CSVS =
-        "flys.backend.importer.skip.w80.csvs";
+            "flys.backend.importer.skip.w80.csvs";
 
     public static final String SKIP_HYKS =
-        "flys.backend.importer.skip.hyks";
+            "flys.backend.importer.skip.hyks";
 
     public static final String SKIP_WST =
-        "flys.backend.importer.skip.wst";
+            "flys.backend.importer.skip.wst";
 
     public static final String SKIP_EXTRA_WSTS =
-        "flys.backend.importer.skip.extra.wsts";
+            "flys.backend.importer.skip.extra.wsts";
 
     public static final String SKIP_FIXATIONS =
-        "flys.backend.importer.skip.fixations";
+            "flys.backend.importer.skip.fixations";
 
     public static final String SKIP_OFFICIAL_LINES =
-        "flys.backend.importer.skip.official.lines";
+            "flys.backend.importer.skip.official.lines";
 
     public static final String SKIP_FLOOD_WATER =
-        "flys.backend.importer.skip.flood.water";
+            "flys.backend.importer.skip.flood.water";
 
     public static final String SKIP_FLOOD_PROTECTION =
-        "flys.backend.importer.skip.flood.protection";
+            "flys.backend.importer.skip.flood.protection";
 
     public static final String SKIP_BED_HEIGHT =
-        "flys.backend.importer.skip.bed.height";
+            "flys.backend.importer.skip.bed.height";
 
     public static final String SKIP_DA66S =
-        "flys.backend.importer.skip.da66s";
+            "flys.backend.importer.skip.da66s";
 
     public static final String SKIP_SEDIMENT_DENSITY =
-        "flys.backend.importer.skip.sediment.density";
+            "flys.backend.importer.skip.sediment.density";
 
     public static final String SKIP_POROSITY =
-        "flys.backend.importer.skip.porosity";
+            "flys.backend.importer.skip.porosity";
 
     public static final String SKIP_MORPHOLOGICAL_WIDTH =
-        "flys.backend.importer.skip.morphological.width";
+            "flys.backend.importer.skip.morphological.width";
 
     public static final String SKIP_FLOW_VELOCITY =
-        "flys.backend.importer.skip.flow.velocity";
+            "flys.backend.importer.skip.flow.velocity";
 
     public static final String SKIP_SEDIMENT_LOAD_LS =
-        "flys.backend.importer.skip.sediment.load.ls";
+            "flys.backend.importer.skip.sediment.load.ls";
 
     public static final String SKIP_SEDIMENT_LOAD =
-        "flys.backend.importer.skip.sediment.load";
+            "flys.backend.importer.skip.sediment.load";
 
     public static final String SKIP_WATERLEVELS =
-        "flys.backend.importer.skip.waterlevels";
+            "flys.backend.importer.skip.waterlevels";
 
     public static final String SKIP_WATERLEVEL_DIFFERENCES =
-        "flys.backend.importer.skip.waterlevel.differences";
+            "flys.backend.importer.skip.waterlevel.differences";
 
     public static final String SKIP_MEASUREMENT_STATIONS =
-        "flys.backend.importer.skip.measurement.stations";
+            "flys.backend.importer.skip.measurement.stations";
 
     public static final String SKIP_SQ_RELATION =
-        "flys.backend.importer.skip.sq.relation";
+            "flys.backend.importer.skip.sq.relation";
 
     public static final Double CROSS_SECTION_SIMPLIFICATION_EPSILON =
-        getDouble("flys.backend.importer.cross.section.simplification.epsilon");
+            getDouble("flys.backend.importer.cross.section.simplification.epsilon");
 
 
+    private enum SInfoSkip {
+        BED_MOBILITY("bed_mobility"), //
+        SELECTED_ADDITIONAL("selected_additional"), //
+        INFRASTRUCTURE("infrastructure"), //
+        CHANNEL("channel"), //
+        COLLISION("collision"), //
+        DAILY_DISCHARGE("daily_discharge"), //
+        TKH("tkh"), //
+        FLOW_DEPTH("flow_depth"), //
+        DEPTH_EVOLUTION("depth_evolution");
+
+        private final String name;
+
+        private SInfoSkip(final String suffix) {
+            this.name = "flys.backend.importer.skip.sinfo." + suffix;
+        }
+
+        public String getName() {
+            return this.name;
+        }
+
+        public boolean getFlag() {
+            return Config.getFlag(getName());
+        }
+    }
+
+    private enum UInfoSkip {
+        SALIX("salix");
+
+        private final String name;
+
+        private UInfoSkip(final String suffix) {
+            this.name = "flys.backend.importer.skip.uinfo." + suffix;
+        }
+
+        public String getName() {
+            return this.name;
+        }
+
+        public boolean getFlag() {
+            return Config.getFlag(getName());
+        }
+    }
+
     public static final Config INSTANCE = new Config();
 
     private Config() {
     }
 
-    public static final boolean getFlag(String key) {
-        String flag = System.getProperty(key);
-        return flag != null
-            ? Boolean.valueOf(flag)
-            : Boolean.getBoolean(SKIP_DEFAULT);
+    public static final boolean getFlag(final String key) {
+        final String flag = System.getProperty(key);
+        return (flag != null) ? Boolean.valueOf(flag) : Boolean.getBoolean(SKIP_DEFAULT);
     }
 
-    public static final Double getDouble(String key) {
+    public static final Double getDouble(final String key) {
         try {
-            String value = System.getProperty(key);
+            final String value = System.getProperty(key);
             return value != null
-                ? Double.valueOf(value)
-                : null;
-        } catch (NumberFormatException nfe) {
+                    ? Double.valueOf(value)
+                            : null;
+        } catch (final NumberFormatException nfe) {
             return null;
         }
     }
@@ -253,5 +295,45 @@
     public boolean skipSQRelation() {
         return getFlag(SKIP_SQ_RELATION);
     }
+
+    public boolean skipSInfoBedMobility() {
+        return SInfoSkip.BED_MOBILITY.getFlag();
+    }
+
+    public boolean skipSInfoSelectedAdditional() {
+        return SInfoSkip.SELECTED_ADDITIONAL.getFlag();
+    }
+
+    public boolean skipSInfoInfrastructure() {
+        return SInfoSkip.INFRASTRUCTURE.getFlag();
+    }
+
+    public boolean skipSInfoChannel() {
+        return SInfoSkip.CHANNEL.getFlag();
+    }
+
+    public boolean skipSInfoCollision() {
+        return SInfoSkip.COLLISION.getFlag();
+    }
+
+    public boolean skipSInfoDailyDischarge() {
+        return SInfoSkip.DAILY_DISCHARGE.getFlag();
+    }
+
+    public boolean skipSInfoTkh() {
+        return SInfoSkip.TKH.getFlag();
+    }
+
+    public boolean skipSInfoFlowDepth() {
+        return SInfoSkip.FLOW_DEPTH.getFlag();
+    }
+
+    public boolean skipSInfoDepthEvolution() {
+        return SInfoSkip.DEPTH_EVOLUTION.getFlag();
+    }
+
+    public boolean skipUInfoSalix() {
+        return UInfoSkip.SALIX.getFlag();
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :