--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java	2015/02/27 15:42:08	2408
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressUtils.java	2015/05/24 08:49:41	2561
@@ -32,12 +32,12 @@
 			return 'u';
 			
 		case 'ö':
-			return 'o';
+			return 'ø';
 		case 'ô':
 			return 'o';
 
 		case 'ä':
-			return 'a';
+			return 'æ';
 		case 'â':
 			return 'a';
 			
@@ -69,6 +69,9 @@
 	}
 	
 	public static String injectIntoBk(String bkrute, String injected) {
+		if (bkrute == null)
+			return null;
+		
 		String parts[] = bkrute.split("/");
 		
 		if (parts.length != 4) {
@@ -174,8 +177,11 @@
 			
 			if (current != 'Æ'&& current != 'Ø' && current != 'Å') {
 				if ( (i+1 == len || 
-						(Character.isAlphabetic(indAdresse.charAt(i+1)) == false
-						/*&& indAdresse.charAt(i+1) != '.'*/)
+						(Character.isAlphabetic(indAdresse.charAt(i+1) ) == false
+						/*&& indAdresse.charAt(i+1) != '.'*/
+						
+						&& checkCo(indAdresse,i) == false // Fra sortér C/O
+								)
 						) 
 					) {
 					result.litra = "" + current;
@@ -279,6 +285,15 @@
 		return result; 
 	}
 	
+	public static boolean checkCo(String addr, int pos) {
+		
+		if ( StringUtils.substring(addr, pos, pos+3).equalsIgnoreCase("C/O") )
+			return true;
+		
+		return false;
+
+	}
+	
 }