--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/04/19 15:49:14	3006
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/05/02 08:00:47	3034
@@ -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;
 
@@ -24,18 +23,21 @@
 
 public class DawaTask extends Task {
 	
-	final String kommentarTemplate = "Oprettet via DAWA";
+	final static String KOMMENTAR_TEMPLATE = "Oprettet via DAWA";
 	
 	private TaskLogger logger = TaskLogger.getInstance(); 
 	
 	private short regionCode;
 	private String regionName;
 	
+	int antalBehandlede = 0;
+	int antalKommuner = 0;
 	
 	
-	DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
+	DeduplicateHelper<String> dedup = new DeduplicateHelper<>();
 	
-	DeduplicateHelper<String> dedup = new DeduplicateHelper<>(); 
+	
+	 
 	
 	public DawaTask(short regionCode, String regionName){
 		this.regionCode = regionCode;		
@@ -46,7 +48,9 @@
 	@Override
 	protected void taskRun() throws Exception {
 		TimingHelper timer = new TimingHelper();
-			
+				
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
+		
 		DawaWebservice dawa = new DawaWebservice();
 		TreeMap<String, DawaGade> search = new TreeMap<>();
 		
@@ -72,16 +76,18 @@
 		
 		Map<String,Integer> kommuner = dawa.kommunerIRegion(regionCode);
 		
-		String subject = "DAWA indlæsning done";
+		String subject = "DAWA indlæsning - " + regionName;
 		
 		StringBuilder headerSB = new StringBuilder();
-		headerSB.append("<h1>Indlæsnings rapport for " + regionName + " / " + regionCode + " </h1><br>");
+		headerSB.append("<h1>Indlæsnings rapport for " + regionName + " </h1><br>");
 		
 		int totalAntalNye = 0;
 		int totalAntalFejl = 0;
 		int totalAntalUkendt = 0;
 		int totalAntalDobbelt = 0;
 		
+		antalKommuner = kommuner.size();
+		
 		
 		StringBuilder sb = new StringBuilder();
 		
@@ -94,20 +100,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;
@@ -121,7 +130,7 @@
 				if (fundet == false) {
 					dawaAddr.gadeid = gade.gadeids.iterator().next();
 					dawaAddr.state = AddressState.CREATED;
-					dawaAddr.kommentar = kommentarTemplate;
+					dawaAddr.kommentar = KOMMENTAR_TEMPLATE;
 					nyeAdresser.add(dawaAddr);
 				}			
 			}
@@ -129,7 +138,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<>();
@@ -145,9 +154,14 @@
 			totalAntalFejl += saveFail.size();
 			totalAntalUkendt += ukendteDAV.size();
 			totalAntalDobbelt += dobbeltGadeidDAV.size();
+			
+			
+			antalBehandlede++;
 	
 			
-			sb.append("<h2>Kommune: " + kommunenavn + " / " + kommunekode + "</h2><br>\n");
+			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 +174,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");
@@ -179,6 +193,9 @@
 		
 		MailSender.sendMail(subject, headerSB.toString() + sb.toString() );
 
+		
+		//Cleaning
+		dedup.clear();
 	}
 	
 	private void addressTable(StringBuilder sb, List<Address> addr) {
@@ -216,7 +233,12 @@
 
 	@Override
 	public double getPercentCompleted() {
-		return 0;
+		if (antalKommuner == 0) {
+			return 0;	
+		}
+		
+		return  (antalBehandlede / ((double)antalKommuner) ) * 100.0;
+		
 	}