--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java 2016/02/05 10:11:06 2926 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java 2016/02/05 11:01:48 2927 @@ -41,26 +41,31 @@ ThreadPoolExecutor threadPool; + boolean isIncremental; + String type; - public AfstandAndenRuteTask(String distributor) { + public AfstandAndenRuteTask(String distributor, String type) { this.distributor = distributor; + this.type = type; + + 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 +84,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); + Database db = new Database(conn, isIncremental); + + db.prepareIncrementalSearch(); Queue
ikkeDaekkede = db.hentAlleIkkedaekkedeAdresser(consts.getMinPostnr(), consts.getMaxPostnr() ); antalIkkeDaekkede = ikkeDaekkede.size(); @@ -240,8 +249,11 @@ @Override public String getDetail() { - // TODO Auto-generated method stub - return ""; + if (isIncremental) { + return "Type: incremental"; + } else { + return "Type: full"; + } }