changeset 5558:b223be96758c

Merged
author Sascha L. Teichmann <teichmann@intevation.de>
date Thu, 04 Apr 2013 15:28:33 +0200 (2013-04-04)
parents fd7285e3829b
children bf016afe92f5
files flys-backend/src/main/java/de/intevation/flys/importer/parsers/WstParser.java
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WstParser.java	Thu Apr 04 12:27:54 2013 +0200
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WstParser.java	Thu Apr 04 15:28:33 2013 +0200
@@ -260,7 +260,10 @@
                             }
                             ImportWstColumn iwc = wst.getColumn(i);
                             iwc.setName(candidate);
-                            iwc.setTimeInterval(guessDate(candidate));
+                            String potentialDate = daten != null && i < daten.length
+                                ? daten[i]
+                                : candidate;
+                            iwc.setTimeInterval(guessDate(potentialDate));
                         }
                         columnHeaderChecked = true;
                     }

http://dive4elements.wald.intevation.org