--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/05/07 16:07:46	2153
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/09/12 14:05:10	2217
@@ -2,37 +2,53 @@
 
 import java.io.File;
 import java.io.FileReader;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 import dk.daoas.fulddaekning.BoundingBox.BoundingBoxException;
 
 public class Lookup {
+
+	static final String CONFIG_FILENAME = "fulddaekning.properties";
+
 	static int max_workers;
 	static boolean verbose;
 	
-	static Properties conf;
+	static boolean rename_tables;
+	static String distributor;
+	
+	static SafeProperties conf;
 	static Logger logger = Logger.getLogger( Lookup.class.toString() );
 	
 	int postnr;
 	Database db;
 		
-	ArrayList<Adresse> daekkedeAdresser;
+	Adresse daekkedeAdresser[];
 	Queue<Adresse> queue;
 	
 	Map<Integer, LookupWorker> workers = new ConcurrentHashMap<Integer, LookupWorker>();
 
-	static int flestDaekkedeAntal = 0;
-	static int flestDaekkedePostnr;
 	
-	static int flestIkkeDaekkedeAntal = 0;
-	static int flestIkkeDaekkedePostnr;
+	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) {
@@ -40,13 +56,20 @@
 		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;
 		
@@ -63,18 +86,13 @@
 			
 			logger.info("Henter _ikke_ daekkede adresser i " + postnr);
 			queue = db.hentIkkedaekkedeAdresser(postnr);
-			queueSize = queue.size();
 			
-			if (daekkedeAdresser.size() > flestDaekkedeAntal) {
-				flestDaekkedeAntal = daekkedeAdresser.size();
-				flestDaekkedePostnr = postnr;
-			}
-			
-			if (queueSize > flestIkkeDaekkedeAntal) {
-				flestIkkeDaekkedeAntal = queueSize;
-				flestIkkeDaekkedePostnr = postnr;
-			}
+			stat.postnr = postnr;
+			stat.antalDaekkede = daekkedeAdresser.length;
+			stat.antalIkkeDaekkede = queue.size();
 			
+			saveStatistics(stat);
+						
 			
 			logger.info("Starter beregning for " + postnr);
 			start2 = System.currentTimeMillis();
@@ -103,15 +121,19 @@
 		}
 		long now = System.currentTimeMillis();
 		
-		logger.info("Antal daekkede:" + daekkedeAdresser.size() + "  postnr=" + postnr);
-		logger.info("Antal ikke-daekkede:" + queueSize + "  postnr=" + postnr);
-		
+
+		logger.info( stat.toString() );
 		logger.info("Done! elapsed=" + (now-start1) + "/" +  (now-start2) + "  postnr=" + postnr);
 	}
 	
 	public void shutdownWorker(int workerid) {
 		logger.info("Shutting down worker: " + workerid);
-		workers.remove(workerid);
+		LookupWorker key = workers.remove(workerid);
+		
+		if (key == null) {
+			System.out.println("Error removing worker from set");
+			System.exit(0);
+		}
 	}
 	
 	// Getters and setters
@@ -123,7 +145,7 @@
 
 
 
-	public ArrayList<Adresse> getDaekkedeAdresser() {
+	public Adresse[] getDaekkedeAdresser() {
 		return daekkedeAdresser;
 	}
 
@@ -144,24 +166,42 @@
 	
 	public static void main(String[] args) throws Exception {
 		
-		File confFile = new File("fulddaekning.properties");
+		//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 );
+		
+		
+		
+		
+		
+		File confFile = new File( CONFIG_FILENAME );
 		if (! confFile.exists() ) {
-			logger.warning("Config file not found");
+			logger.warning("Config file not found: " + CONFIG_FILENAME);
 			System.exit(1);
 		}
 				
-		conf = new Properties();
+		conf = new SafeProperties();
 		conf.load( new FileReader(confFile) );
 		
-		max_workers = Integer.parseInt( conf.getProperty("MAX_WORKERS") );
+		max_workers = Integer.parseInt( conf.getSafeProperty("MAX_WORKERS") );
 		logger.info("Starting with MAX_WORKERS:" + max_workers);
 		
-		verbose = Boolean.parseBoolean( conf.getProperty("VERBOSE") );
+		verbose = Boolean.parseBoolean( conf.getSafeProperty("VERBOSE") );
 		logger.info("Starting with VERBOSE:" + verbose);
 		
+		rename_tables = Boolean.parseBoolean( conf.getSafeProperty("RENAMETABLES") );
+		logger.info("Starting with RENAMETABLES:" + rename_tables);
+		
+		distributor = conf.getSafeProperty("DISTRIBUTOR");
+		distributor = distributor.toUpperCase();
+		Constants.init(distributor);
+
+		
 		Database db = new Database(conf);
 		
-		db.resetResultTable();
+		
 
 		
 		
@@ -172,20 +212,53 @@
 		logger.info("Finder postnumre");
 		List<Integer> postnumre = db.hentPostnumre();
 		
+		// Først validerer vi BBox på alle postnummre, for at undgå fuldt stop midt i beregningen
+		for(Integer postnr : postnumre) { //
+			logger.info("Validerer BBox for " + postnr);
+			BoundingBox bbox = db.getBoundingbox(postnr);
+			bbox.validateBbox();
+		}
+		
+		
+		//pre-check er ok - reset tmp tabel og start søgningen
+		db.resetResultTable();
+		
 		for(Integer postnr : postnumre) {
 			Lookup lookup = new Lookup(postnr, db);
 			lookup.doLookup();			
 		}
 		
+		if (rename_tables) {
+			db.renameResultTables();
+		} else {
+			logger.info( "Rename tables is disabled !!!" );
+		}
+		
 		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);
+		long elapsed = now - start ;
+
+		logger.info("Flest Ikke-dækkede, " + flestIkkeDaekkede);
+		logger.info("Flest Dækkede, " + flestDaekkede);
+		logger.info("Fuld load done : " + formatMilliSeconds(elapsed) );
+
 		
+		/*
+		/// Test
+		db.resetResultTable();
+		Lookup lookup = new Lookup(2750, db);
+		lookup.doLookup();		
+		long now = System.currentTimeMillis();
+		long elapsed = now - start ;
+		logger.info("Fuld load done : " + formatMilliSeconds(elapsed) );*/
+	}
+	
+	static String formatMilliSeconds(long milliseconds) {
+		int mseconds = (int) milliseconds % 1000;
+		int seconds = (int) (milliseconds / 1000) % 60 ;
+		int minutes = (int) ((milliseconds / (1000*60)) % 60);
+		int hours   = (int) ((milliseconds / (1000*60*60)) % 24);
 		
-		//Lookup lookup = new Lookup(7400, db);
-		//lookup.doLookup();		
+		return String.format("%02d:%02d:%02d.%03d", hours, minutes, seconds, mseconds);
 	}
 		
 }