--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java	2016/02/03 21:31:51	2908
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java	2016/02/13 13:16:34	2946
@@ -41,26 +41,29 @@
 
 	ThreadPoolExecutor threadPool;
 
+	boolean isIncremental;
 
 
-	public AfstandAndenRuteTask(String distributor) {
+	public AfstandAndenRuteTask(String distributor, String type) {
 		this.distributor = distributor;
+		
+		type = type.toUpperCase();
+		switch(type) {
+		case "FULL":
+			isIncremental = false;
+			break;
+		case "INCREMENTAL":
+			isIncremental = true;
+			break;
+		default:
+			throw new RuntimeException("Unknown type" + type);			
+		}
 	}
 
 
 	@Override
 	protected void taskRun() throws Exception {
-
-
-
-
-		//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 );
-
-
+		
 
 		Constants.init(distributor);
 		Constants consts = Constants.getInstance();
@@ -79,11 +82,15 @@
 		}
 		logger.info("Starting with MAX_WORKERS:" + max_workers);	 
 		setupThreadPool(max_workers);
+		
+		logger.info("Starting with INCREMENTAL:" + isIncremental);
 
 
 
 		try (Connection conn = DBConnection.getConnection() ) {
-			Database db = new Database(conn);
+			DatabaseRouteDistance db = new DatabaseRouteDistance(conn, isIncremental);
+			
+			db.prepareIncrementalSearch();
 
 			Queue<Address> ikkeDaekkede = db.hentAlleIkkedaekkedeAdresser(consts.getMinPostnr(), consts.getMaxPostnr() );
 			antalIkkeDaekkede = ikkeDaekkede.size();
@@ -170,9 +177,9 @@
 
 
 
-			} else {
+			} /*else {
 				/// Test
-				/*
+				
 				db.resetResultTable();
 
 
@@ -181,8 +188,8 @@
 
 				short post = (short) 2700;			
 				Lookup lookup = new Lookup(post, db, threadPool);
-				lookup.doLookup();*/								
-			}
+				lookup.doLookup();								
+			} */
 
 
 			long now = System.currentTimeMillis();
@@ -240,8 +247,11 @@
 
 	@Override
 	public String getDetail() {
-		// TODO Auto-generated method stub
-		return "";
+		if (isIncremental) {
+			return "Type: incremental";
+		} else {
+			return "Type: full";
+		}
 	}