--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/CsvUdtraek.java 2015/07/23 07:42:50 2637 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/CsvUdtraek.java 2015/07/23 09:25:03 2638 @@ -30,6 +30,10 @@ case "ikkedaekket": str = udtraekIkkeDaekket(); break; + case "100pct": + str = udtraek100Pct(); + break; + default: str = null; break; @@ -46,6 +50,7 @@ response.setContentType("text/html"); w.print("Type parameter is blank or invalid value
"); w.print("Type: ikkedaekket
"); + w.print("Type: 100pct
"); } } @@ -65,6 +70,28 @@ sb.append( addr.gadeid ).append(";") .append( addr.postnr ).append(";") .append( addr.vejnavn ).append(";") + .append( addr.husnr ).append(";") + .append( addr.husnrbogstav ).append(";") + .append( addr.distributor != null ? addr.distributor : "" ) + .append( "\n" ); + } + + return sb.toString(); + } + + private String udtraek100Pct() { + AddressSearch search = (AddressSearch) getServletContext().getAttribute("search"); + if (search == null) { + return "data struktur ikke indlæst"; + } + + StringBuilder sb = new StringBuilder(); + sb.append("gadeid;postnr;vejnavn;husnr;husnrbogstav;distributor\r\n"); + + for (Address addr : search.get100PctAddresses() ) { + sb.append( addr.gadeid ).append(";") + .append( addr.postnr ).append(";") + .append( addr.vejnavn ).append(";") .append( addr.husnr ).append(";") .append( addr.husnrbogstav ).append(";") .append( addr.distributor != null ? addr.distributor : "" )