--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/04/25 08:44:37 3018 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/04/25 08:47:26 3019 @@ -487,13 +487,13 @@ } if (targetAddress.distributor.equals("BK")) { - modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, korelisteHelper); - modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, korelisteHelper); - modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, korelisteHelper); - modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, korelisteHelper); - modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, korelisteHelper); - modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, korelisteHelper); - modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); } @@ -603,21 +603,22 @@ System.out.println("Build Completed"); } + - public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper korelisteHelper) { + public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper ruteHelper) { if (source.rute != null) { return 0; } - source.koreliste = calculateExtendedBkKoreliste(bean, target); - source.koreliste = korelisteHelper.getInstance(source.koreliste); + source.rute = calculateExtendedBkRoute(bean, target); + source.rute = ruteHelper.getInstance(source.rute); - if (source.koreliste != null) { - source.rute = target.rute; + if (source.rute != null) { + source.koreliste = target.koreliste; return 1; } else { return 0; - } + } } public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper ruteHelper) { @@ -717,7 +718,9 @@ } /////////////////////////////////////////////////////////// - private String calculateExtendedBkKoreliste(ExtendedBean eb, RoutingInfo targetRoute) { + + + private String calculateExtendedBkRoute(ExtendedBean eb, RoutingInfo targetRoute) { if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel return null; } @@ -728,7 +731,7 @@ } else { inject = ".."; } - return AddressUtils.injectIntoBk(targetRoute.koreliste, inject); + return inject + targetRoute.rute; }