# HG changeset patch # User Sascha L. Teichmann # Date 1439288262 -7200 # Node ID cb6514faf0d997868441ea3695a991c0457f0d18 # Parent 9483a5bf4219207d38c867be1f468b35e4a11392 Made ETL process more tolerant for dates in SGM/DIPS gauges. Upgrade to ojdbc6.jar. diff -r 9483a5bf4219 -r cb6514faf0d9 etl/README.txt --- a/etl/README.txt Fri Jun 26 19:33:17 2015 +0200 +++ b/etl/README.txt Tue Aug 11 12:17:42 2015 +0200 @@ -26,8 +26,8 @@ * Für die Nutzung der Oracle JDBC-Bindings muss das Oracle-Treiber-Jar in das lokale Maven-Repository installiert werden: - $ mvn install:install-file -DgroupId=ojdbc5.jar -DartifactId=ojdbc5 \ - -Dversion=0 -Dpackaging=jar -Dfile=ojdbc.jar -DgeneratePom=true + $ mvn install:install-file -DgroupId=ojdbc6.jar -DartifactId=ojdbc6 \ + -Dversion=0 -Dpackaging=jar -Dfile=ojdbc6.jar -DgeneratePom=true * Für den eigentlichen Oracle-kompatiblen Bau kann dann folgendes aufgerufen werden: diff -r 9483a5bf4219 -r cb6514faf0d9 etl/pom-oracle.xml --- a/etl/pom-oracle.xml Fri Jun 26 19:33:17 2015 +0200 +++ b/etl/pom-oracle.xml Tue Aug 11 12:17:42 2015 +0200 @@ -67,8 +67,8 @@ runtime - ojdbc5.jar - ojdbc5 + ojdbc6.jar + ojdbc6 0 diff -r 9483a5bf4219 -r cb6514faf0d9 etl/src/main/java/org/dive4elements/river/etl/aft/DIPSGauge.java --- a/etl/src/main/java/org/dive4elements/river/etl/aft/DIPSGauge.java Fri Jun 26 19:33:17 2015 +0200 +++ b/etl/src/main/java/org/dive4elements/river/etl/aft/DIPSGauge.java Tue Aug 11 12:17:42 2015 +0200 @@ -28,7 +28,7 @@ private static Logger log = Logger.getLogger(DIPSGauge.class); public static final Pattern DATE_PATTERN = Pattern.compile( - "(\\d{4})-(\\d{2})-(\\d{2})\\s+(\\d{2}):(\\d{2}):(\\d{2})"); + "(\\d{4})-(\\d{2})-(\\d{2})(?:\\s+|T)(\\d{2}):(\\d{2}):(\\d{2})"); public static final Comparator DATE_CMP = new Comparator() { public int compare(Datum a, Datum b) {