--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/CsvUdtraek.java 2015/02/26 13:11:45 2384 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/CsvUdtraek.java 2015/02/27 08:24:56 2394 @@ -1,6 +1,7 @@ package dk.daoas.daoadresseservice; import java.io.IOException; +import java.io.PrintWriter; import java.sql.SQLException; import java.util.List; @@ -47,8 +48,11 @@ response.setHeader("Content-Disposition", "filename=" + type + ".csv"); response.getWriter().print(str); } else { - response.setContentType("text/plain"); - response.getWriter().print("Type parameter is blank or invalid value"); + PrintWriter w = response.getWriter(); + response.setContentType("text/html"); + w.print("Type parameter is blank or invalid value
"); + w.print("Type: ikkedaekket
"); + w.print("Type: sammenlign
"); } } @@ -91,13 +95,13 @@ int antal_dage = 2; if (request.getParameter("antaldage") != null ) { - antal_dage = Integer.parseInt("antaldage"); + antal_dage = Integer.parseInt( request.getParameter("antaldage") ); } try { StringBuilder sb = new StringBuilder(); - sb.append("besked;postnr;adresse;gl status;ny status\n"); + sb.append("besked;postnr;adresse;gl status;ny status;ny split\n"); List addrList = DatabaseLayer.getLoggedAdresses(antal_dage); @@ -136,6 +140,7 @@ } } sb.append("Antal adresser testet: ;").append(addrList.size()).append(";;;\n"); + sb.append("Antal dage: ;").append( antal_dage ).append(";;;\n"); return sb.toString(); @@ -147,9 +152,13 @@ private void appendLogLine(String msg, StringBuilder sb, LoggedAddress addr, SearchResult res) { - sb.append(msg).append(";").append(addr.postnr).append(";") + sb.append(msg).append(";") + .append(addr.postnr).append(";") .append(addr.adresse).append(";") - .append(addr.status).append(";").append(res.status).append("\n"); + .append(addr.status).append(";") + .append(res.status).append(";") + .append(res.splitResult).append(";") + .append("\n"); }