# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1365082158 -7200
# Node ID bf016afe92f51d38c49aece64df1ad25b6176fb9
# Parent  b223be96758cef608a66362277e74f1b07df505a# Parent  b91cc44312b716ab5c056e10ad6e8e36c0b1ba5a
Merged

diff -r b91cc44312b7 -r bf016afe92f5 flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java
--- a/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java	Thu Apr 04 14:58:18 2013 +0200
+++ b/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java	Thu Apr 04 15:29:18 2013 +0200
@@ -78,6 +78,8 @@
 
     public static void registerAsMBean(SessionFactory factory) {
 
+        /* XXX: Commented out till it is configured correctly.
+
         StatisticsService statsMBean = new StatisticsService();
         statsMBean.setSessionFactory(factory);
         statsMBean.setStatisticsEnabled(true);
@@ -102,6 +104,7 @@
         catch (NotCompliantMBeanException ncmbe) {
             log.warn(ncmbe, ncmbe);
         }
+        */
     }
 
     public static Configuration createConfiguration() {
diff -r b91cc44312b7 -r bf016afe92f5 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 14:58:18 2013 +0200
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WstParser.java	Thu Apr 04 15:29:18 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;
                     }