--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/03/07 20:50:57 2967 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/03/07 21:00:45 2968 @@ -522,13 +522,11 @@ Map hundredePct = db.get100PctList(); for (Address addr : alleAdresser) { - if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { - continue; - } + if (addr.distributor != null && addr.distributor.equals("LUKKET")) { continue; - } + } HundredePctBean bean = hundredePct.get(addr.postnr); @@ -536,11 +534,24 @@ continue; } - addr.daekningsType = DaekningsType.DAEKNING_100PCT; - addr.routingMandag.rute = bean.rute; - addr.routingMandag.koreliste = bean.koreliste; - addr.dbkBane = bean.dbkBane; - addr.distributor = bean.distributor; + short modifyCounter = 0; + modifyCounter += update100PctRouting(bean, addr.routingMandag); + modifyCounter += update100PctRouting(bean, addr.routingTirsdag); + modifyCounter += update100PctRouting(bean, addr.routingOnsdag); + modifyCounter += update100PctRouting(bean, addr.routingTorsdag); + modifyCounter += update100PctRouting(bean, addr.routingFredag); + modifyCounter += update100PctRouting(bean, addr.routingLordag); + modifyCounter += update100PctRouting(bean, addr.routingSondag); + + + if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET && modifyCounter>0) { + addr.daekningsType = DaekningsType.DAEKNING_100PCT; + addr.dbkBane = bean.dbkBane; + addr.distributor = bean.distributor; + } + + + } //////////////////////////////////////////////////////////////////////////////////// @@ -587,6 +598,16 @@ } + public short update100PctRouting(HundredePctBean bean, RoutingInfo routing) { + if (routing.rute == null) { + routing.rute = bean.rute; + routing.koreliste = bean.koreliste; + return 1; + } else { + return 0; + } + } + public DataStatisticsBean getStatistics() { return stats; }