--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/01/28 22:20:23	2877
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/02/13 13:16:34	2946
@@ -14,7 +14,8 @@
 import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType;
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
-import dk.daoas.adressevedligehold.db.DatabaseLayerImplementation;
+import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate;
+import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import dk.daoas.adressevedligehold.util.MiscUtils;
 import dk.daoas.adressevedligehold.util.TimingHelper;
@@ -28,6 +29,9 @@
 
 public class AddressManager {
 	
+	private TaskLogger logger = TaskLogger.getInstance();
+	
+	private int duplicateCount;
 	
 	List<Address> addressList;
 	
@@ -40,7 +44,7 @@
 	Map<Short,Short> dbkBaneMap = new TreeMap<Short,Short>();
 	
 	public AddressManager() throws SQLException {
-		DatabaseLayerImplementation db = new DatabaseLayerImplementation();
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 		
 		searchStructure = new TreeMap<Integer, TreeMap<Short, ArrayList<Address>> >();
 		
@@ -84,11 +88,12 @@
 			list.trimToSize();
 		}
 		
-		System.out.println("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
+		logger.info("AddressManager ready, elapsed " + timer.getElapsed() + "ms");
 		
 		
 	}
-	
+
+	@SuppressWarnings("PMD.CollapsibleIfStatements")	
 	public void closeUnvisitedAddresses(String distributor, EntryUgedage ugedage) {
 		for (Address addr : addressList) {
 			if (addr.distributor == null)
@@ -181,8 +186,8 @@
 				continue;
 			}
 			
-			System.out.println(addr.state + ": " + addr.toStringExtended() );
-			System.out.println(addr.getRuteString() );
+			logger.info(addr.state + ": " + addr.toStringExtended() );
+			logger.info(addr.getRuteString() );
 			
 			if (count++ > 50)
 				return;
@@ -190,7 +195,7 @@
 	}
 	
 	public void writeBackChanges() {
-		System.out.println("Writing back changes");
+		logger.info("Writing back changes");
 		TimingHelper timer = new TimingHelper();
 		
 		List<Address> updates = new ArrayList<Address>(1024*1024);
@@ -205,14 +210,14 @@
 			}
 		}
 		
-		DatabaseLayerImplementation db = new DatabaseLayerImplementation();
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 		
 		db.updateAddresses(updates);
 		db.saveNewAddresses(inserts);
 
 		
 		
-		System.out.println("Writeback done: elapsed " + timer.getElapsed() + "ms.");
+		logger.info("Writeback done: elapsed " + timer.getElapsed() + "ms.");
 	}
 	
 	
@@ -253,6 +258,7 @@
 		}
 	}
 	
+	@SuppressWarnings("PMD.CollapsibleIfStatements")	
 	private void visitRange(AddressSourceEntry entry) {
 		
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
@@ -261,7 +267,7 @@
 				unknownStreets.put(entry.gadeid, entry.vejnavn);				
 			}
 			
-			System.out.println("[Range] Ukendt gadeID " + entry);
+			logger.info("[Range] Ukendt gadeID " + entry);
 			return;
 		}
 		
@@ -301,7 +307,7 @@
 	private void updateAddress(Address addr, AddressSourceEntry entry) {
 		if ( addr.distributor != null && addr.distributor.equals(entry.distributor) == false) {
 			rejectedEntries.add(entry);
-			System.out.println("Afviser " + entry);
+			logger.info("Afviser " + entry);
 			return;
 		}
 		
@@ -323,7 +329,9 @@
 					}
 				}				
 			} else {
-				System.out.println( "Double visit monday " + addr);
+				duplicateCount++;
+				logger.info( "Double visit monday " + addr);
+				return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
 			}
 
 		}
@@ -345,7 +353,9 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit tuesday " + addr);
+				duplicateCount++;
+				logger.info( "Double visit tuesday " + addr);
+				return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
 			}				
 		}
 
@@ -365,7 +375,9 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit wednesday " + addr);
+				duplicateCount++;
+				logger.info( "Double visit wednesday " + addr);
+				return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
 			}		
 		}
 
@@ -387,7 +399,9 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit thursday " + addr);
+				duplicateCount++;
+				logger.info( "Double visit thursday " + addr);
+				return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
 			}					
 		}
 
@@ -408,7 +422,9 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit friday " + addr);
+				duplicateCount++;
+				logger.info( "Double visit friday " + addr);
+				return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
 			}	
 		}
 
@@ -430,7 +446,9 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit saturday " + addr);
+				duplicateCount++;
+				logger.info( "Double visit saturday " + addr);
+				return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
 			}					
 		}
 
@@ -451,7 +469,9 @@
 					}
 				}
 			} else {
-				System.out.println( "Double visit sunday " + addr);
+				duplicateCount++;
+				logger.info( "Double visit sunday " + addr);
+				return; // if the entry is duplicate on one day that it covers - then it will be as well on all the othters
 			}					
 		}
 		
@@ -479,9 +499,25 @@
 	
 	
 	private void createFromEntry(AddressSourceEntry entry) {
+		if (entry.husnr >= 1000) { //husnumre i DK må kun være på 3 cifre
+			return;
+		}
+		
 		if (entry.husnr == 999) {
 			return;
 		}
+		
+		if (entry.litra.length() > 1) { //litra må kun være på 1 tegn
+			return;
+		}
+		if (entry.litra.length() == 1) {
+			char litra = entry.litra.charAt(0);
+			if ( Character.isLetter(litra) == false ) {
+				return;
+			}
+			
+		}
+		
 		if (entry.kommunekode == 0 || entry.vejkode == 0) {
 			return;
 		}
@@ -489,6 +525,10 @@
 			return;
 		}
 		
+		if (entry.gadeid == 0) {
+			return;
+		}
+				
 		String gadeidStr = Integer.toString(entry.gadeid);
 		if (gadeidStr.length() != 9) {
 			return;
@@ -499,70 +539,40 @@
 		
 		
 		
-		System.out.println("Opretter adresse ud fra " + entry);
-		
-		Address a = new Address();
-		a.state = AddressState.CREATED;
+		logger.info("Opretter adresse ud fra " + entry);
 		
-		a.distributor = entry.distributor;
-		a.gadeid = entry.gadeid;
-		a.kommunekode = entry.kommunekode;
-		a.vejkode = entry.vejkode;
-		a.vejnavn = entry.vejnavn;
-		a.husnr = entry.husnr;
-		a.husnrbogstav = entry.litra;
-		a.postnr = entry.postnr;
-		//a.visited = true;
+		Address addr = new Address();
+		addr.state = AddressState.CREATED;
 		
-		if (entry.ugedage.mandag) {
-			a.ruteMandag = entry.rute;
-			a.korelisteMandag = entry.koreliste;
-		}
-		if (entry.ugedage.tirsdag) {
-			a.ruteTirsdag = entry.rute;
-			a.korelisteTirsdag = entry.koreliste;
-		}
-		if (entry.ugedage.onsdag) {
-			a.ruteOnsdag = entry.rute;
-			a.korelisteOnsdag = entry.koreliste;
-		}		
-		if (entry.ugedage.torsdag) {
-			a.ruteTorsdag = entry.rute;
-			a.korelisteTorsdag = entry.koreliste;
-		}		
-		if (entry.ugedage.fredag) {
-			a.ruteFredag = entry.rute;
-			a.korelisteFredag = entry.koreliste;
-		}		
-		if (entry.ugedage.lordag) {
-			a.ruteLordag = entry.rute;
-			a.korelisteLordag = entry.koreliste;
-		}		
-		if (entry.ugedage.sondag) {
-			a.ruteSondag = entry.rute;
-			a.korelisteLordag = entry.koreliste;
-		}		
+		addr.distributor = entry.distributor;
+		addr.gadeid = entry.gadeid;
+		addr.kommunekode = entry.kommunekode;
+		addr.vejkode = entry.vejkode;
+		addr.vejnavn = entry.vejnavn;
+		addr.husnr = entry.husnr;
+		addr.husnrbogstav = entry.litra;
+		addr.postnr = entry.postnr;
 		
-		updateDbkBane(a);
-		
-		// Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten
 		
+		updateAddress(addr, entry);
 
-		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( a.gadeid );
+		
+		// Nu er det nye adresse object oprettet - nu skal det gemmes i søge strukturen og totallisten		
+		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( addr.gadeid );
 		
 		if (gade == null) {
 			gade = new TreeMap<Short,ArrayList<Address>>();
-			searchStructure.put(a.gadeid, gade);
+			searchStructure.put(addr.gadeid, gade);
 		}
 		
-		ArrayList<Address> litraList = gade.get(a.husnr);
+		ArrayList<Address> litraList = gade.get(addr.husnr);
 		if (litraList == null) {
 			litraList = new ArrayList<Address>();
-			gade.put(a.husnr, litraList);
+			gade.put(addr.husnr, litraList);
 		}
 		
-		litraList.add(a);
-		addressList.add(a);
+		litraList.add(addr);
+		addressList.add(addr);
 				
 	}
 	
@@ -613,11 +623,11 @@
 			bane = 204;
 			break;
 		default:
-			throw new RuntimeException("Ukendt distributor" + a.distributor); //Silence findBugs
+			throw new RuntimeException("Ukendt distributor: " + a.distributor); //Silence findBugs
 		}
 		
 		if (bane == null) {
-			throw new RuntimeException("Ukendt bane for postnr" + a.postnr);
+			throw new RuntimeException("Ukendt bane for postnr: " + a.postnr);
 		}
 		
 		if (a.dbkBane != bane) {
@@ -636,7 +646,9 @@
 		return Collections.unmodifiableMap( unknownStreets );
 	}
 	
-	
+	public int getDuplicateCount() {
+		return duplicateCount;
+	}
 	
 	public int getRejectedCount() {
 		return rejectedEntries.size();