[Dive4elements-commits] [PATCH 2 of 3] Merged

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1365082113 -7200
# Node ID b223be96758cef608a66362277e74f1b07df505a
# Parent  fd7285e3829bb4ea8beb0efab3a57004302bc1a2
Merged

diff -r fd7285e3829b -r b223be96758c flys-backend/src/main/java/de/intevation/flys/importer/parsers/WstParser.java
--- 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;
                     }