# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1348767949 0
# Node ID 9e4468d503297744dcccf8ec51f9525f72c3469c
# Parent  6b1ca6ec4e3cbf8cde9c583cf5163e7b946d99fb
fix issue862/1.

flys-backend/trunk@5624 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 6b1ca6ec4e3c -r 9e4468d50329 flys-backend/ChangeLog
--- a/flys-backend/ChangeLog	Thu Sep 27 13:43:31 2012 +0000
+++ b/flys-backend/ChangeLog	Thu Sep 27 17:45:49 2012 +0000
@@ -1,3 +1,11 @@
+2012-09-27  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	For issue862/1, fix parsing of year field of bed height csvs,
+	which sometimes contain non-year character.
+
+	* src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java:
+	  Extend RE to parse year field of Bed Height data csv.
+
 2012-09-27  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/model/RiverAxis.java:
diff -r 6b1ca6ec4e3c -r 9e4468d50329 flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java	Thu Sep 27 13:43:31 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/BedHeightParser.java	Thu Sep 27 17:45:49 2012 +0000
@@ -46,7 +46,7 @@
     public static final String SEPERATOR_CHAR  = ";";
 
     public static final Pattern META_YEAR =
-        Pattern.compile("^Jahr: (\\d*).*");
+        Pattern.compile("^Jahr: [^0-9]*(\\d*).*");
 
     public static final Pattern META_TIMEINTERVAL =
         Pattern.compile("^Zeitraum: Epoche (\\d*)-(\\d*).*");