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

[scm-commit at wald.intevation.org]

Author: alfonx
Date: 2013-01-23 23:11:03 +0100 (Wed, 23 Jan 2013)
New Revision: 2196

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 20:59:23 UTC (rev 2195)
+++ trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2013-01-23 22:11:03 UTC (rev 2196)
@@ -187,9 +187,9 @@
 
 		String[] s = splitInternal1(stringStrHnZusatz);
 
-		String[] nervigeZusaetzeAnFalscherStelle = new String[] { 
-//				"(?i)^(.*\\d.*)(\\d\\.\\d\\d)(.*)$",
-				"(?i)^(.*?)\\s*((?:\\d+\\.?)?\\s*(?:reihe|og\\s*(?:rechts|links|zi\\.?|zimmer|li|re|hinten|vorne|)+\\s*(?:\\d+\\.?)?))+\\s*+(.*?)$",
+		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*+(.*?)$",
 		};
 
 		if (s[0] != null) {
@@ -686,7 +686,7 @@
 
 	static public String saeubereStrassenname(final String orginal) {
 		String strasse = LangUtil.removeTags(orginal).toLowerCase();
-		
+
 		// HN. am Ende
 		strasse = RegexCache.getInstance().replaceAll(strasse, "(\\d)\\s*\\.$", "$1");