--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/05/07 07:59:03	2151
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/05/08 09:12:00	2155
@@ -2,10 +2,6 @@
 
 import java.io.File;
 import java.io.FileReader;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,19 +29,41 @@
 	Map<Integer, LookupWorker> workers = new ConcurrentHashMap<Integer, LookupWorker>();
 
 	
+	static Statistik flestDaekkede = new Statistik();
+	static Statistik flestIkkeDaekkede = new Statistik();
+	
+	
+	static class Statistik {
+		int postnr;
+		int antalDaekkede = 0;
+		int antalIkkeDaekkede = 0;
+		
+		@Override
+		public String toString() {
+			return "postnr=" + postnr + " antalIkkeDaekkede=" + antalIkkeDaekkede + " antalDaekkede="  + antalDaekkede;
+		}
+	}
+	
 	
 	public Lookup(int postnr, Database db) {
 		this.postnr = postnr;
 		this.db = db;
 	}
 	
-	
+	public static void saveStatistics(Statistik stat) {
+		if (stat.antalDaekkede > flestDaekkede.antalDaekkede) {
+			flestDaekkede = stat;
+		}
+		if (stat.antalIkkeDaekkede > flestIkkeDaekkede.antalIkkeDaekkede) {
+			flestIkkeDaekkede = stat;
+		}		
+	}
 	
 	public void doLookup() throws BoundingBoxException {
 		logger.info("Starting for postnr=" + postnr);
 		
-		int queueSize=-1;
-		
+		Statistik stat = new Statistik();
+				
 		long start1 = System.currentTimeMillis();		
 		long start2 = 0;
 		
@@ -62,8 +80,13 @@
 			
 			logger.info("Henter _ikke_ daekkede adresser i " + postnr);
 			queue = db.hentIkkedaekkedeAdresser(postnr);
-			queueSize = queue.size();
 			
+			stat.postnr = postnr;
+			stat.antalDaekkede = daekkedeAdresser.size();
+			stat.antalIkkeDaekkede = queue.size();
+			
+			saveStatistics(stat);
+						
 			
 			logger.info("Starter beregning for " + postnr);
 			start2 = System.currentTimeMillis();
@@ -92,10 +115,9 @@
 		}
 		long now = System.currentTimeMillis();
 		
-		logger.info("Antal daekkede:" + daekkedeAdresser.size() );
-		logger.info("Antal ikke-daekkede:" + queueSize );
-		
-		logger.info("Done! elapsed=" + (now-start1) + "/" +  (now-start2) );
+
+		logger.info( stat.toString() );
+		logger.info("Done! elapsed=" + (now-start1) + "/" +  (now-start2) + "  postnr=" + postnr);
 	}
 	
 	public void shutdownWorker(int workerid) {
@@ -148,8 +170,7 @@
 		verbose = Boolean.parseBoolean( conf.getProperty("VERBOSE") );
 		logger.info("Starting with VERBOSE:" + verbose);
 		
-		Connection conn = getConnection();
-		Database db = new Database(conn);
+		Database db = new Database(conf);
 		
 		db.resetResultTable();
 
@@ -168,35 +189,15 @@
 		}
 		
 		long now = System.currentTimeMillis();
-		
+
+		logger.info("Flest Ikke-dækkede, " + flestIkkeDaekkede);
+		logger.info("Flest Dækkede, " + flestDaekkede);
 		logger.info("Fuld load done : " + (now-start) );
+
 		
 		
 		//Lookup lookup = new Lookup(7400, db);
 		//lookup.doLookup();		
 	}
-	
-	public static Connection getConnection() throws SQLException, IOException {
-				
-		String db_host = conf.getProperty("DB_HOST");
-		String db_user = conf.getProperty("DB_USER");
-		String db_pass = conf.getProperty("DB_PASS");
-
-		
 		
-
-	    Connection conn = null;
-	    Properties connectionProps = new Properties();
-	    connectionProps.put("user", db_user);
-	    connectionProps.put("password", db_pass);
-
-	        conn = DriverManager.getConnection(
-	                   "jdbc:mysql://" +
-	                   db_host +
-	                   ":3306/",
-	                   connectionProps);
-	    logger.info("Connected to database");
-	    return conn;
-	}
-	
 }