--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/04/19 19:55:19	3008
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/04/20 14:15:02	3013
@@ -3,9 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
-import java.util.TreeSet;
 
 import dk.daoas.adressevedligehold.MailSender;
 import dk.daoas.adressevedligehold.beans.Address;
@@ -13,6 +11,7 @@
 import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate;
 import dk.daoas.adressevedligehold.tasks.Task;
 import dk.daoas.adressevedligehold.tasks.TaskLogger;
+import dk.daoas.adressevedligehold.util.CountMap;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import dk.daoas.adressevedligehold.util.TimingHelper;
 
@@ -94,20 +93,23 @@
 			
 			List<Address> dawaListe = dawa.adresserIKommune(kommunekode);
 			// stage 3 søg		
-			Set<String> ukendteDAV = new TreeSet<>();
-			Set<String> dobbeltGadeidDAV = new TreeSet<>();
+			CountMap ukendteDAV = new CountMap();
+			CountMap dobbeltGadeidDAV = new CountMap();
 			List<Address> nyeAdresser = new ArrayList<>();
 			
 			for (Address dawaAddr : dawaListe) {
 				String dav = getDAVid(dawaAddr);
 				DawaGade gade = search.get(dav);
 				if (gade == null) {
-					ukendteDAV.add(dav + " " + dawaAddr.vejnavn);
+					String key = dav + " " + dawaAddr.vejnavn;
+					ukendteDAV.increment(key);
 					continue;
 				}
 				
 				if (gade.gadeids.size() != 1) {
-					dobbeltGadeidDAV.add(dav + " " + dawaAddr.vejnavn);
+					String key = dav + " " + dawaAddr.vejnavn;
+					dobbeltGadeidDAV.increment(key);
+					continue;
 				}
 				
 				boolean fundet = false;
@@ -129,7 +131,7 @@
 			
 			db.saveNewAddresses(nyeAdresser);
 			
-			logger.info("Save to db done - sending report mail");
+			logger.info("Save to db done - adding to report mail");
 			
 			List<Address> saveOK = new ArrayList<>();
 			List<Address> saveFail = new ArrayList<>();
@@ -148,6 +150,8 @@
 	
 			
 			sb.append("<h2>Kommune: " + kommunenavn + "</h2>\n");
+			
+			sb.append("Kommunekode: " + kommunekode + "<br>\n");
 			sb.append("Antal Inserts: " + saveOK.size() + "<br>\n");
 			sb.append("Antal insert fails: " + saveFail.size() + "<br>\n");
 			sb.append("Antal ukendte dav: " + ukendteDAV.size() + "<br>\n");
@@ -160,16 +164,16 @@
 			addressTable(sb, saveFail);
 			
 			sb.append("<h3>Ukendte DAV:</h3>\n");
-			for (String dav : ukendteDAV) {
-				sb.append(dav + "<br>\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 (String dav : dobbeltGadeidDAV) {
-				sb.append(dav + "<br>\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");