Mercurial > dive4elements > river
changeset 5559:bf016afe92f5
Merged
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Thu, 04 Apr 2013 15:29:18 +0200 |
parents | b223be96758c (diff) b91cc44312b7 (current diff) |
children | ccda0a49a97f |
files | |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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() {
--- 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; }