changeset 1257:423b5f620467

merged.
author Raimund Renkert <raimund.renkert@intevation.de>
date Tue, 17 Jan 2017 17:29:11 +0100
parents 1d9552e05b76 (diff) c0db68c9a87d (current diff)
children cb88ab44c2be
files
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/importer/laf/LafObjectListener.java	Wed Jan 04 15:36:47 2017 +0100
+++ b/src/main/java/de/intevation/lada/importer/laf/LafObjectListener.java	Tue Jan 17 17:29:11 2017 +0100
@@ -39,6 +39,7 @@
         errors = new HashMap<String, List<ReportItem>>();
         currentErrors = new ArrayList<ReportItem>();
         currentUOrt = new HashMap<String, String>();
+        currentEOrt = new HashMap<String, String>();
     }
 
     public LafRawData getData() {
@@ -122,8 +123,10 @@
             currentProbe.addEntnahmeOrt(currentEOrt);
             currentEOrt.clear();
         }
-        currentEOrt = new HashMap<String, String>();
         currentProbe = data.new Probe();
+        hasEKoordinaten = false;
+        hasEGemeinde = false;
+        hasEHerkunfstland = false;
     }
 
     /**
@@ -145,7 +148,6 @@
             currentProbe.addEntnahmeOrt(currentEOrt);
             currentEOrt.clear();
         }
-        currentEOrt = new HashMap<String, String>();
         currentProbe = data.new Probe();
         if (!currentErrors.isEmpty()) {
             errors.put(currentProbe.getIdentifier(),
@@ -153,6 +155,9 @@
         }
         currentErrors.clear();
         currentProbe = null;
+        hasEKoordinaten = false;
+        hasEGemeinde = false;
+        hasEHerkunfstland = false;
         hasDatenbasis = false;
         hasMessprogramm = false;
         hasUmwelt = false;
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)