# HG changeset patch # User Raimund Renkert # Date 1484670551 -3600 # Node ID 423b5f620467db5b8e7680d0ea1dd369d0f1b4b0 # Parent 1d9552e05b76905c5f2d5a4574f7d74b23cf1cb7# Parent c0db68c9a87dd8cf7a6a56858fb6f2a3ba781a4c merged. diff -r c0db68c9a87d -r 423b5f620467 src/main/java/de/intevation/lada/importer/laf/LafObjectListener.java --- 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>(); currentErrors = new ArrayList(); currentUOrt = new HashMap(); + currentEOrt = new HashMap(); } public LafRawData getData() { @@ -122,8 +123,10 @@ currentProbe.addEntnahmeOrt(currentEOrt); currentEOrt.clear(); } - currentEOrt = new HashMap(); currentProbe = data.new Probe(); + hasEKoordinaten = false; + hasEGemeinde = false; + hasEHerkunfstland = false; } /** @@ -145,7 +148,6 @@ currentProbe.addEntnahmeOrt(currentEOrt); currentEOrt.clear(); } - currentEOrt = new HashMap(); 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;