--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/05/08 09:12:00	2155
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/09/11 10:35:55	2202
@@ -14,10 +14,16 @@
 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;
@@ -155,24 +161,32 @@
 	
 	public static void main(String[] args) throws Exception {
 		
-		File confFile = new File("fulddaekning.properties");
+		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();
+		
 
 		
 		
@@ -183,11 +197,28 @@
 		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("Flest Ikke-dækkede, " + flestIkkeDaekkede);