--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java	2016/01/31 21:56:30	2890
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java	2016/02/03 21:31:51	2908
@@ -11,30 +11,31 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.FileHandler;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
 
 import ags.utils.dataStructures.trees.thirdGenKD.KdTree;
+import dk.daoas.adressevedligehold.ReloadHelper;
 import dk.daoas.adressevedligehold.ServiceConfig;
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.db.DBConnection;
 import dk.daoas.adressevedligehold.tasks.Task;
-import dk.daoas.adressevedligehold.util.HttpUtil;
+import dk.daoas.adressevedligehold.tasks.TaskLogger;
 
 
 
 public class AfstandAndenRuteTask extends Task {
 
-	final Logger logger = Logger.getLogger( AfstandAndenRuteTask.class.toString() );
+	private TaskLogger logger = TaskLogger.getInstance();
 
-	final boolean verbose = false;//
+	final static boolean VERBOSE = false;//
 
 
 	static boolean test_mode;
 
 
 	String distributor;
+	int antalIkkeDaekkede = -1;
+	
+	AtomicInteger antalBeregnet = new AtomicInteger();
 
 
 
@@ -54,10 +55,10 @@
 
 
 		//Setup j.u.l Logger
-		Logger root = Logger.getLogger("");
-		FileHandler fhandler = new FileHandler("fulddaekning.log"); // Ingen max størrelse, ingen rotation og ingen append
-		fhandler.setFormatter( new SimpleFormatter() );
-		root.addHandler( fhandler );
+		//Logger root = Logger.getLogger("");
+		//FileHandler fhandler = new FileHandler("fulddaekning.log"); // Ingen max størrelse, ingen rotation og ingen append
+		//fhandler.setFormatter( new SimpleFormatter() );
+		//root.addHandler( fhandler );
 
 
 
@@ -79,7 +80,7 @@
 		logger.info("Starting with MAX_WORKERS:" + max_workers);	 
 		setupThreadPool(max_workers);
 
-		int antalIkkeDaekkede = -1;
+
 
 		try (Connection conn = DBConnection.getConnection() ) {
 			Database db = new Database(conn);
@@ -144,7 +145,7 @@
 				CyclicBarrier barrier = new CyclicBarrier(max_workers + 1);
 
 				for (int i=0; i<max_workers; i++) {
-					LookupWorker worker = new LookupWorker(i, this, barrier, ikkeDaekkede, hoTrees,antalFundne,db,verbose,consts);
+					LookupWorker worker = new LookupWorker(i, this, barrier, ikkeDaekkede, hoTrees,antalFundne,antalBeregnet,db,VERBOSE,consts);
 					threadPool.submit( worker );
 				}
 
@@ -159,13 +160,9 @@
 
 				if (test_mode == false && this.isAborted() == false) {
 					db.renameResultTables();
+					
+					ReloadHelper.triggerReload( "AfstandAndenRute/" + distributor );
 
-					String trigger_url = ServiceConfig.getInstance().trigger_url;
-
-					logger.info("Calling trigger URL");
-					String url = trigger_url + "&trigger=AfstandAndenRute/" + distributor;
-
-					HttpUtil.getContentString(url, 500);
 
 				} else {
 					logger.info( "Rename tables is disabled !!!" );
@@ -236,7 +233,7 @@
 
 	@Override
 	public String getDescription() {
-		return "Afstand anden rute";
+		return "Afstand anden rute/" + distributor;
 	}
 
 
@@ -244,14 +241,13 @@
 	@Override
 	public String getDetail() {
 		// TODO Auto-generated method stub
-		return null;
+		return "";
 	}
 
 
 
 	@Override
-	public short getPercentCompleted() {
-		// TODO Auto-generated method stub
-		return 0;
+	public double getPercentCompleted() {
+		return (antalBeregnet.get() / ((float)antalIkkeDaekkede)) * 100.0;
 	}
 }