changeset 8761:cb6514faf0d9

Made ETL process more tolerant for dates in SGM/DIPS gauges. Upgrade to ojdbc6.jar.
author Sascha L. Teichmann <teichmann@intevation.de>
date Tue, 11 Aug 2015 12:17:42 +0200
parents 9483a5bf4219
children 86da84a95fac
files etl/README.txt etl/pom-oracle.xml etl/src/main/java/org/dive4elements/river/etl/aft/DIPSGauge.java
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-       <groupId>ojdbc5.jar</groupId>
-       <artifactId>ojdbc5</artifactId>
+       <groupId>ojdbc6.jar</groupId>
+       <artifactId>ojdbc6</artifactId>
        <version>0</version>
     </dependency>
   </dependencies>
--- 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<Datum> DATE_CMP = new Comparator<Datum>() {
         public int compare(Datum a, Datum b) {

http://dive4elements.wald.intevation.org