--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java 2015/02/12 13:57:32 2267 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java 2015/02/13 15:45:24 2283 @@ -27,6 +27,17 @@ return out; } + public static String injectIntoBk(String bkrute, String injected) { + String parts[] = bkrute.split("/"); + + if (parts.length != 4) { + System.out.println(">BK " + bkrute); + return bkrute; + } + + return parts[0] + "/" + parts[1] + "/" + parts[2] + "/" + injected + parts[3]; + } + /* * Er en 1-1 port af SplitAdresse() fra funcSplitAdresse.php @@ -97,13 +108,15 @@ if (i>=len) //THN tilføjelse return result; - if (Character.isAlphabetic(indAdresse.charAt(i)) && - (i+1 == len || Character.isAlphabetic(indAdresse.charAt(i+1)) == false - ) + if (Character.isAlphabetic(indAdresse.charAt(i) )) { + if ( (i+1 == len || + (Character.isAlphabetic(indAdresse.charAt(i+1)) == false && indAdresse.charAt(i+1) != '.') + ) ) { - result.litra = "" + indAdresse.charAt(i); - result.litra = result.litra.toUpperCase(); - i++; + result.litra = "" + indAdresse.charAt(i); + result.litra = result.litra.toUpperCase(); + i++; + } } @@ -191,7 +204,7 @@ } // saml resten op (kan gøres smartere med en substr) - result.resten = indAdresse.substring(i); + result.resten = indAdresse.substring(i).trim(); return result; }