--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/05/07 07:39:26	2150
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/05/07 16:07:46	2153
@@ -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;
@@ -32,6 +28,11 @@
 	
 	Map<Integer, LookupWorker> workers = new ConcurrentHashMap<Integer, LookupWorker>();
 
+	static int flestDaekkedeAntal = 0;
+	static int flestDaekkedePostnr;
+	
+	static int flestIkkeDaekkedeAntal = 0;
+	static int flestIkkeDaekkedePostnr;
 	
 	
 	public Lookup(int postnr, Database db) {
@@ -64,6 +65,16 @@
 			queue = db.hentIkkedaekkedeAdresser(postnr);
 			queueSize = queue.size();
 			
+			if (daekkedeAdresser.size() > flestDaekkedeAntal) {
+				flestDaekkedeAntal = daekkedeAdresser.size();
+				flestDaekkedePostnr = postnr;
+			}
+			
+			if (queueSize > flestIkkeDaekkedeAntal) {
+				flestIkkeDaekkedeAntal = queueSize;
+				flestIkkeDaekkedePostnr = postnr;
+			}
+			
 			
 			logger.info("Starter beregning for " + postnr);
 			start2 = System.currentTimeMillis();
@@ -92,10 +103,10 @@
 		}
 		long now = System.currentTimeMillis();
 		
-		logger.info("Antal daekkede:" + daekkedeAdresser.size() );
-		logger.info("Antal ikke-daekkede:" + queueSize );
+		logger.info("Antal daekkede:" + daekkedeAdresser.size() + "  postnr=" + postnr);
+		logger.info("Antal ikke-daekkede:" + queueSize + "  postnr=" + postnr);
 		
-		logger.info("Done! elapsed=" + (now-start1) + "/" +  (now-start2) );
+		logger.info("Done! elapsed=" + (now-start1) + "/" +  (now-start2) + "  postnr=" + postnr);
 	}
 	
 	public void shutdownWorker(int workerid) {
@@ -148,8 +159,9 @@
 		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();
 
 		
 		
@@ -166,35 +178,14 @@
 		}
 		
 		long now = System.currentTimeMillis();
-		
+				
 		logger.info("Fuld load done : " + (now-start) );
+		logger.info("Flest Ikke-dækkede, " + flestIkkeDaekkedePostnr + ": " + flestIkkeDaekkedeAntal);
+		logger.info("Flest Dækkede, " + flestDaekkedePostnr + ": " + flestDaekkedeAntal);
 		
 		
 		//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;
-	}
-	
 }