--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/CsvUdtraek.java 2015/03/20 13:57:47 2457 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/CsvUdtraek.java 2015/03/25 09:40:50 2502 @@ -1,8 +1,10 @@ -package dk.daoas.daoadresseservice; +package dk.daoas.daoadresseservice.admin; import java.io.IOException; import java.io.PrintWriter; import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import javax.servlet.ServletException; @@ -11,11 +13,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import dk.daoas.daoadresseservice.AddressSearch; import dk.daoas.daoadresseservice.beans.Address; import dk.daoas.daoadresseservice.beans.LoggedAddress; import dk.daoas.daoadresseservice.beans.SearchResult; import dk.daoas.daoadresseservice.beans.SearchResult.Status; import dk.daoas.daoadresseservice.db.DatabaseLayer; +import dk.daoas.daoadresseservice.util.TimingHelper; /** * Servlet implementation class CsvUdtraek @@ -106,6 +110,8 @@ int antal_nyok_glok = 0; try { + TimingHelper timer = new TimingHelper(); + StringBuilder sb = new StringBuilder(); sb.append("besked;postnr;adresse;gl status;ny status;ny split;ny vej\n"); @@ -156,8 +162,20 @@ } + + + sb.append("Forbrugt tid: ;").append( timer.getElapsed() ).append(";;;\n"); + sb.append("SearchData genereret: ;").append( search.getStatistics().buildTime ).append(";;;\n"); + sb.append("Sammenligning csv genereret: ;").append( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() ) ).append(";;;\n"); + + sb.append("Antal dage: ;").append( antal_dage ).append(";;;\n"); - sb.append("Antal adresser testet: ;").append(addrList.size()).append(";;;\n"); + sb.append("Antal adresser testet: ;").append(addrList.size()).append(";;;\n"); + double sekunder = timer.getElapsed() / 1000.0; + int adresserPrSekund = (int) Math.round( addrList.size() / sekunder ); + sb.append("Antal adresser testet/s: ;").append(adresserPrSekund).append(";;;\n"); + + sb.append("Antal ny ok, gl ok: ;").append( antal_nyok_glok ).append(";;;\n"); sb.append("Antal ny ok, gl google: ;").append( antal_nyok_glgoogle ).append(";;;\n"); sb.append("Antal ny ok, gl fejl: ;").append( antal_nyok_glfejl ).append(";;;\n");