[Schmitzm-commits] r2199 - trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses

[scm-commit at wald.intevation.org]

Author: alfonx
Date: 2013-01-26 17:55:54 +0100 (Sat, 26 Jan 2013)
New Revision: 2199

Modified:
   trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
Log:


Modified: trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
===================================================================
--- trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2013-01-23 22:27:06 UTC (rev 2198)
+++ trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2013-01-26 16:55:54 UTC (rev 2199)
@@ -189,7 +189,7 @@
 
 		String[] nervigeZusaetzeAnFalscherStelle = new String[] {
 				// "(?i)^(.*\\d.*)(\\d\\.\\d\\d)(.*)$",
-				"(?i)^(.*?)\\s*((?:\\d+\\.?)?\\s*\\b(?:reihe|parzell?e|og\\s*(?:rechts|links|zi\\.?|zimmer|li|re|hinten|vorne|)\\b+\\s*(?:\\d+\\.?)?))+\\s*+(.*?)$",
+				"(?i)^(.*?)\\s*((?:\\d+\\.?)?\\s*\\b(?:reihe|parzell?e|og\\s*(?:rechts|links|zi\\.?|zimmer|li|re|hinten|vorne|)\\.?\\b+\\s*(?:\\d+\\.?)?))+\\s*+(.*?)$",
 		};
 
 		if (s[0] != null) {
@@ -251,6 +251,7 @@
 		zusammen = zusammen.replaceAll("3. Juni", "Dritten Juni");
 		zusammen = zusammen.replaceAll("(?i)^(.*\\d.*)\\b((?:zi?\\.?|zimmer)\\s*\\d+)(.*)$", "$1 $3");
 		zusammen = zusammen.replaceAll("(?i)^(.*\\d.*)\\b(we\\s*\\d\\.\\d\\d)(.*)$", "$1 $3");
+		zusammen = zusammen.replaceAll("(?i)^(.*\\d.*)\\b(app\\s*\\.?\\s*\\d+\\.?\\d+\\s*)$", "$1");
 		zusammen = zusammen.replaceAll("(?i)^(.*\\d.*)(\\d\\.\\d\\d)(.*)$", "$1 $3");
 
 		zusammen = trimQuotes(zusammen);