# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1317120821 0
# Node ID d1d6fd8cfbb2b25e3448a8dbda5986c9ccb215f7
# Parent  103205742e0272b00c150977890ea310049949e7
Improved regex used to track WSPLGEN errors - will now match critical errors as well.

flys-artifacts/trunk@2835 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 103205742e02 -r d1d6fd8cfbb2 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Tue Sep 27 10:18:06 2011 +0000
+++ b/flys-artifacts/ChangeLog	Tue Sep 27 10:53:41 2011 +0000
@@ -1,3 +1,8 @@
+2011-09-27  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java: Track
+	  critical errors as well (improved regular expression for errors).
+
 2011-09-27	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* ChangeLog: Fixed whitespace usage.
diff -r 103205742e02 -r d1d6fd8cfbb2 flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java	Tue Sep 27 10:18:06 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/ProblemObserver.java	Tue Sep 27 10:53:41 2011 +0000
@@ -15,11 +15,11 @@
 
 
     public static final Pattern WSPLGEN_ERROR_START = Pattern.compile(
-        ".*->Fehler\\s*\\((\\d+)\\).*",
+        ".*->(.*Fehler)(\\s*\\((\\d+)\\).*)*",
         Pattern.DOTALL);
 
     public static final Pattern WSPLGEN_ERROR_END = Pattern.compile(
-        ".*<-Fehler .*",
+        ".*<-(.*Fehler).*",
         Pattern.DOTALL);
 
     public static final Pattern WSPLGEN_WARNING_START = Pattern.compile(
@@ -62,7 +62,18 @@
     protected void update(String log) {
         Matcher startError = WSPLGEN_ERROR_START.matcher(log);
         if (startError.matches()) {
-            error = Integer.parseInt(startError.group(1));
+            if (startError.groupCount() >= 2) {
+                String tmp = startError.group(2);
+
+                if (tmp != null && tmp.length() > 0) {
+                    error = Integer.parseInt(tmp);
+                }
+                else error = 1;
+            }
+            else {
+                error = 1;
+            }
+
             return;
         }