--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/CsvUdtraek.java	2015/03/25 07:34:09	2500
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/CsvUdtraek.java	2015/05/08 20:36:56	2532
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.net.URLEncoder;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -48,6 +49,7 @@
 		}
 		
 		if (str != null) {
+			type = URLEncoder.encode(type, "UTF-8");
 			response.setContentType("text/csv");
 			response.setHeader("Content-Disposition", "filename=" + type + ".csv");
 			response.getWriter().print(str);
@@ -163,13 +165,19 @@
 			}
 			
 			
+			
 			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");