--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/DataLoader.java	2015/11/04 22:10:59	2768
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/DataLoader.java	2015/11/05 08:06:00	2769
@@ -12,6 +12,7 @@
 import javax.servlet.ServletContext;
 
 import dk.daoas.daoadresseservice.admin.ServiceConfig;
+import dk.daoas.daoadresseservice.beans.DataStatisticsBean;
 import dk.daoas.daoadresseservice.db.DatabaseLayerImplementation;
 
 public class DataLoader {
@@ -27,12 +28,12 @@
 		config = conf;
 	}
 	
-	public void doLoad() {
+	public void doLoad(String trigger) {
 		synchronized(this) {
 			if (isRunning == false) {
 				isRunning = true;
 				
-				Thread t = new Thread( new DataLoadWorker(this), "SearchDataLoader");
+				Thread t = new Thread( new DataLoadWorker(this, trigger), "SearchDataLoader");
 				t.start();
 			}
 		}
@@ -58,8 +59,10 @@
 		static final Logger logger = Logger.getLogger(DataLoadWorker.class.getName());
 		
 		DataLoader loader;
-		public DataLoadWorker(DataLoader ld) {
+		String trigger;
+		public DataLoadWorker(DataLoader ld, String trigger) {
 			this.loader = ld;
+			this.trigger = trigger;
 		}
 		
 
@@ -75,7 +78,8 @@
 	    		loader.ctxt.setAttribute("search", search);
 	    		
 	    		if (loader.config.notifyEmail != null && loader.config.notifyEmail.length() > 0) {
-	    			sendStatusEmail(search, oldSearch);
+	    			DataStatisticsBean oldStats = oldSearch != null ? oldSearch.getStatistics() : null;
+	    			sendStatusEmail(search.getStatistics(), oldStats);
 	    		}
 	    		
 	    		if (oldSearch != null) {
@@ -90,7 +94,7 @@
 	    	
 		}
 		
-		protected void sendStatusEmail(AddressSearch newSearch, AddressSearch oldSearch) {
+		protected void sendStatusEmail(DataStatisticsBean newStats, DataStatisticsBean oldStats) {
 			Properties props = new Properties();
 			props.put("mail.smtp.host", "10.30.1.28");
 			
@@ -100,14 +104,36 @@
 					session.setDebug(false);
 					
 					
+					String body = "Trigger: " + trigger + "\r\n\r\n";
+					body += "New stats:\r\n";
+					
+					body += "Direkte:      " + newStats.direkteCount + "\r\n";
+					body += "Extended:     " + newStats.extendedCount + "\r\n";
+					body += "100%:         " + newStats.hundredePctCount + "\r\n";
+					body += "Ikke-daekket: " + newStats.ikkeDaekketCount + "\r\n";
+					body += "Total:        " + newStats.totalCount + "\r\n";					
+					body += "Elapsed:      " + newStats.elapsed + "\r\n";
+					
+					if (oldStats != null) {
+						body += "\r\n";
+						body += "Delta to previous\r\n";
+						body += "Direkte:      " + (newStats.direkteCount-oldStats.direkteCount) + "\r\n";
+						body += "Extended:     " + (newStats.extendedCount-oldStats.extendedCount) + "\r\n";
+						body += "100:          " + (newStats.hundredePctCount-oldStats.hundredePctCount) + "\r\n";
+						body += "Ikke-daekket: " + (newStats.ikkeDaekketCount-oldStats.ikkeDaekketCount) + "\r\n";
+						body += "Total:        " + (newStats.totalCount-oldStats.totalCount) + "\r\n";
+						
+					}
+							
+					
 					// create a message
 					
 					MimeMessage msg = new MimeMessage(session);
 					msg.setFrom( new InternetAddress("no-reply@daoas.dk") );
 					
 					msg.setRecipient(Message.RecipientType.TO, new InternetAddress(loader.config.notifyEmail) );
-					msg.setSubject("DaoAdresseService status ");			
-					msg.setText("--");
+					msg.setSubject("DaoAdresseService load, trigger: " + trigger);			
+					msg.setText(body);
 					
 					Transport.send(msg);
 			} catch (Exception e) {