--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/07/21 11:48:19	3068
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/07/22 09:48:05	3069
@@ -1,10 +1,14 @@
 package dk.daoas.adressevedligehold.dawa;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.TreeMap;
 
+import com.google.common.base.Splitter;
+
 import dk.daoas.adressevedligehold.MailSender;
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
@@ -81,10 +85,12 @@
 		StringBuilder headerSB = new StringBuilder();
 		headerSB.append("<h1>Indlæsnings rapport for " + regionName + " </h1><br>");
 		
-		int totalAntalNye = 0;
-		int totalAntalFejl = 0;
-		int totalAntalUkendt = 0;
-		int totalAntalDobbelt = 0;
+		List<Address> totalNye = new ArrayList<>();
+		List<Address> totalFejl = new ArrayList<>();
+		CountMap totalUkendtDAV = new CountMap();
+		CountMap totalDobbeltDav = new CountMap();
+		
+		
 		
 		antalKommuner = kommuner.size();
 		
@@ -150,11 +156,12 @@
 				}
 			}
 			
-			totalAntalNye += saveOK.size();
-			totalAntalFejl += saveFail.size();
-			totalAntalUkendt += ukendteDAV.size();
-			totalAntalDobbelt += dobbeltGadeidDAV.size();
+			totalNye.addAll(saveOK);
+			totalFejl.addAll(saveFail);
 			
+			totalUkendtDAV.putAll(ukendteDAV);
+			totalDobbeltDav.putAll(dobbeltGadeidDAV);
+		
 			
 			antalBehandlede++;
 	
@@ -166,55 +173,69 @@
 			sb.append("Antal insert fails: " + saveFail.size() + "<br>\n");
 			sb.append("Antal ukendte dav: " + ukendteDAV.size() + "<br>\n");
 			sb.append("Antal dobbelt gadeid dav: " + dobbeltGadeidDAV.size() + "<br>\n");
-			
-			sb.append("<h3>Adresser ok:</h3>\n");
-			addressTable(sb, saveOK);
-			
-			sb.append("<h3>SQL INSERT fejl:</h3>\n");
-			addressTable(sb, saveFail);
-			
-			sb.append("<h3>Ukendte DAV:</h3>\n");
-			for (Map.Entry<String, Integer> dav : ukendteDAV.entrySet()) {				
-				sb.append(dav.getKey() + " : " + dav.getValue() + "<br>\n");
-			}
-			
-			sb.append("<h3>Dobbelt gadeid DAV:</h3>\n");
-			for (Map.Entry<String, Integer> dav : dobbeltGadeidDAV.entrySet()) {				
-				sb.append(dav.getKey() + " : " + dav.getValue() + "<br>\n");
-			}						
 		}
+		
 		logger.info("Sendingreport mail");
 		
-		headerSB.append("Antal Inserts: " + totalAntalNye + "<br>\n");
-		headerSB.append("Antal insert fails: " + totalAntalFejl + "<br>\n");
-		headerSB.append("Antal ukendte dav: " + totalAntalUkendt + "<br>\n");
-		headerSB.append("Antal dobbelt gadeid dav: " + totalAntalDobbelt + "<br>\n");
+		headerSB.append("Antal Inserts: " + totalNye.size() + "<br>\n");
+		headerSB.append("Antal insert fails: " + totalFejl.size() + "<br>\n");
+		headerSB.append("Antal ukendte dav: " + totalUkendtDAV.size() + "<br>\n");
+		headerSB.append("Antal dobbelt gadeid dav: " + totalDobbeltDav.size() + "<br>\n");
 		headerSB.append("Elapsed: " + timer.getElapsed() + " ms.<br>\n");
 		
-		MailSender.sendMail(subject, headerSB.toString() + sb.toString() );
+		Map<String,String> attachments = new TreeMap<>();
+		attachments.put("saveok.csv", buildAddressFile(totalNye) );
+		attachments.put("savefailed.csv", buildAddressFile(totalFejl) );
+		
+		attachments.put("ukendte_dav.csv", buildDavFile(totalUkendtDAV) );
+		attachments.put("dobbelt_dav_gadeid.csv", buildDavFile(totalDobbeltDav) );
+		
+		
+		MailSender.sendMailWithAttachments(subject, headerSB.toString() + sb.toString(), attachments);
 
 		
 		//Cleaning
 		dedup.clear();
 	}
 	
-	private void addressTable(StringBuilder sb, List<Address> addr) {
-		sb.append("<table border=0>\n");
-		sb.append("<tr><th>GadeID</th><th>Postnr</th><th>Kom.kode</th><th>Vejkode</th><th>Vejnavn</th><th>Husnr<th><th>Litra</th></tr>");
+	private String buildDavFile(CountMap dav) {
+		StringBuilder sb = new StringBuilder();
+		
+		sb.append("Gadeid;Vejnavn;Antal\r\n");
+		for ( Entry<String,Integer> entry : dav.entrySet()) {
+			
+			List<String> split = Splitter.on(' ').limit(2).splitToList(entry.getKey());
+			sb.append( split.get(0) ).append(";");//gadeid
+			sb.append( split.get(1) ).append(";");//vejnavn
+			
+			sb.append( entry.getValue() ).append("\r\n");//vejnavn
+			
+		}
+		
+		return sb.toString();
+	}
+	
+	private String buildAddressFile(List<Address> addr) {
+		
+		Collections.sort(addr); //brug dens egen compareTo funktion
+		
+		StringBuilder sb = new StringBuilder();
+				
+		sb.append("GadeID;Postnr;Kom.kode;Vejkode;Vejnavn;Husnr;Litra\r\n");
 		for (Address a: addr) {
-			sb.append("<tr>");
-			sb.append("<td>&nbsp;").append(a.gadeid).append(" </td>");
-			sb.append("<td>&nbsp;").append(a.postnr).append(" </td>");
-			sb.append("<td>&nbsp;").append(a.kommunekode).append(" </td>");
-			sb.append("<td>&nbsp;").append(a.vejkode).append(" </td>");
-			sb.append("<td>&nbsp;").append(a.vejnavn).append(" </td>");
-			sb.append("<td>&nbsp;").append(a.husnr).append(" </td>");
-			sb.append("<td>&nbsp;").append(a.husnrbogstav).append(" </td>");
+			sb.append(a.gadeid).append(";");
+			sb.append(a.postnr).append(";");
+			sb.append(a.kommunekode).append(";");
+			sb.append(a.vejkode).append(";");
+			sb.append(a.vejnavn).append(";");
+			sb.append(a.husnr).append(";");
+			sb.append(a.husnrbogstav).append("\r\n");
 		}
-		sb.append("</table><br>\n");
+		return sb.toString();
 		
 	}
 	
+	
 	String getDAVid(Address addr) {
 		String dav = String.format("%04d%03d%04d", addr.postnr, addr.kommunekode, addr.vejkode);