--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java	2016/01/28 22:14:42	2876
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressReport.java	2016/02/16 09:40:51	2950
@@ -1,4 +1,4 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.fileupload;
 
 import java.util.HashMap;
 import java.util.List;
@@ -14,11 +14,11 @@
 
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
+import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.TimingHelper;
 
 /* 
- * TODO: detail rapport pr postnr
- * TODO: ved mangel oversigten - skeln mellem om det er nye/CREATED eller om det er gamle kendte adresser
+ * 
  */
 
 public class AddressReport {
@@ -74,6 +74,8 @@
 		}
 	}
 	
+	private static TaskLogger logger = TaskLogger.getInstance();
+	
 	AddressManager addrManager;
 	List<Address> addressList;
 	int entryCount;
@@ -81,9 +83,10 @@
 	AddressSource source;
 	TimingHelper timer;
 	boolean writeBack;
+	int duplicateCount;
 	
-	//TODO: Afviste adresser
-	public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack ) {
+
+	public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack, int duplicateCount ) {
 		this.addrManager = addrManager;
 		addressList = addrManager.getAddressList();
 		this.entryCount = entryCount;
@@ -91,11 +94,11 @@
 		this.source = source;
 		this.timer = timer;
 		this.writeBack = writeBack;
-		
+		this.duplicateCount = duplicateCount;
 	}
 	
 	public void sendRapport() {
-		System.out.println("Sending mail");
+		logger.info("Sending mail");
 		
 		String reportData = getReportData();
 		String subject = "Indlæsnings rapport for " + source.getDistributor();
@@ -106,7 +109,7 @@
 	
 	public static void sendMail(String subject, String htmlBody) {
 	       Properties props = new Properties();
-	        props.put("mail.smtp.host", "10.30.1.28");
+	        props.put("mail.smtp.host", "mail.dao.int");
 	        //props.put("mail.smtp.host", "192.168.12.10");
 	        
 	        try {
@@ -126,7 +129,7 @@
 				
 	        	
 	    	} catch (MessagingException e) {
-				System.out.println("Unable to send report mail " + e.getMessage() );
+				logger.warning("Unable to send report mail ", e );
 			}		
 	}
 	
@@ -138,6 +141,7 @@
 		
 		int createFailCount = 0;
 		
+		int antalUdenGadeid = 0;
 		int antalUdenKommunekode = 0;
 		int antalUdenLatitude = 0;
 		int antalUdenDBKBane = 0;
@@ -150,6 +154,10 @@
 				continue;			
 			}
 			
+			if (a.gadeid == 0) {
+				antalUdenGadeid++;
+			}
+			
 			if (a.kommunekode == 0 || a.vejkode == 0) {				
 				antalUdenKommunekode++;
 			}
@@ -198,6 +206,7 @@
 		sb.append("Skriv til DB: ").append( writeBack ).append("<br>");
 		sb.append("Antal entries: " ).append( entryCount ).append("<br>");
 		sb.append("Antal afviste: " ).append( addrManager.getRejectedCount() ).append("<br>");
+		sb.append("Antal dubletter: " ).append( duplicateCount ).append("<br>");
 		sb.append("Antal fejlede inserts: ").append(createFailCount).append("<br>"); 
 		sb.append("Filen indeholder data til: ");
 		if (ugedage.mandag) sb.append("Mandag, ");
@@ -212,6 +221,7 @@
 		sb.append("<h2>Data Mangler</h2>\n");
 		sb.append("<pre>");
 		sb.append("Mangler kommune/vejkode: ").append(antalUdenKommunekode).append("\n");
+		sb.append("Mangler gadeid: ").append(antalUdenGadeid).append("\n");
 		sb.append("Mangler DBK bane: ").append(antalUdenDBKBane).append("\n");
 		sb.append("Mangler latitude/longitude: ").append(antalUdenLatitude).append("\n");
 		sb.append("</pre>");